clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,799 Commits 494 Branches 1,367 Tags 807 MiB
ad9ee5de84
Commit Graph

30442 Commits

Author SHA1 Message Date
Anatoliy Belsky
87df717909 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix unix/win dir separators
 2012-09-27 19:54:12 +02:00
Anatoliy Belsky
6a50a8640c fix unix/win dir separators 2012-09-27 19:52:34 +02:00
andrey
da96aa848f compile out example plugin in a release build 2012-09-26 17:13:46 +02:00
andrey
263b37bee1 change public key setting to PERDIR and finish code that allows 
to set the key file programatically per mysqli_options()
 2012-09-25 18:26:02 +02:00
andrey
6074df91c6 remove old unicode code, that is was compiled out by using a macro 2012-09-25 16:36:21 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd 
Automatic switchover to SSL with plain-text password is not part of this
 2012-09-25 14:04:36 +02:00
Xinchen Hui
8a930c93dd Merge branch 'PHP-5.4' 2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae Correct the test summary 2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf Merge branch 'PHP-5.4' 2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt
 2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 
Cherry pick to 5.3
 2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Pierrick Charron
6c135dff97 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
 2012-09-22 10:19:16 -04:00
Pierrick Charron
c8687ee63b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
 2012-09-22 10:18:44 -04:00
Pierrick Charron
2e8ab65270 Avoid calling select if maxfd returned by curl_multi_fdset is -1 
As per libcurl documentation :

When libcurl returns -1 in max_fd, it is because libcurl currently
does something that isn't possible for your application to monitor
with a socket and unfortunately you can then not know exactly when
the current action is completed using select().
 2012-09-22 10:15:40 -04:00
Pierrick Charron
70713a27b6 Add CURLOPT_READDATA which was removed by mistake 
I did a check and this is the only one which was removed by mistake.
No other constants are available in 5.4 branch and not in master
 2012-09-22 10:05:52 -04:00
Gustavo Lopes
bf19838c87 Do not disable RFC3678 multicast API on Windows 
The API is supported since Windows Vista and requires targeting Vista
when compiling PHP. Pierre had asked to disable this by default, even
when targeting Vista/Windows Server 2008.

Since XP will not be supported anymore on php-next, any rationale
for this option will not apply anymore.
 2012-09-20 23:36:20 +02:00
Rob Richards
4b9ed49217 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
 2012-09-20 02:35:16 -04:00
Rob Richards
ffa72707c8 fix bug #63015 (Incorrect arginfo for DOMErrorHandler) 2012-09-20 02:34:07 -04:00
Lars Strojny
1c423601a8 Merge branch 'PHP-5.4' 
Conflicts:
	ext/sockets/multicast.h
 2012-09-19 22:23:22 +02:00
Lars Strojny
188c124a57 Bug #63000: MCAST_JOIN_GROUP on OSX is broken 
The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.

The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.

For reference, this was also done in VLC:

* http://trac.videolan.org/vlc/ticket/6104#comment:19
 2012-09-19 22:17:35 +02:00
Lars Strojny
6793e09a4e Merge branch 'PHP-5.4' 2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc Merging PR #116 2012-09-18 23:15:03 +02:00
Anatoliy Belsky
3ad033ffba split tests for the new zlib version on win 2012-09-18 09:59:49 +02:00
Xinchen Hui
26ee1cb0b1 Merge branch 'PHP-5.4' 2012-09-18 10:50:24 +08:00
Xinchen Hui
e2d1eecf99 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-18 10:48:16 +08:00
Xinchen Hui
e66a5ce56f Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken) 2012-09-18 10:46:58 +08:00
Stanislav Malyshev
44e3a9be7e Merge branch 'PHP-5.4' 
* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail
 2012-09-17 15:58:48 -07:00
Xinchen Hui
6096988704 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-17 11:21:14 +08:00
Xinchen Hui
eb881a1dd1 test should fail 2012-09-17 11:20:24 +08:00
Stanislav Malyshev
088640adb2 Merge branch 'PHp-5.4' 
* PHp-5.4:
  news for bug #61421
  commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
 2012-09-15 23:02:44 -07:00
Mark Jones
84202c367e commit for php bug 61421 
enabling SHA2 and RMD160 for openssl signature verification
 2012-09-15 22:59:34 -07:00
Xinchen Hui
d23f9194b1 Merge branch 'PHP-5.4' 2012-09-15 11:33:26 +08:00
Xinchen Hui
2eff69f402 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-15 11:32:08 +08:00
Xinchen Hui
1b13ff6ec7 Add XFAIL test for bug #62852 2012-09-15 11:29:47 +08:00
Xinchen Hui
e766f85405 Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)" 
see: http://news.php.net/php.bugs/173451

This reverts commit 46a3f25772.
 2012-09-15 11:26:21 +08:00
Christopher Jones
b7fa9bfc04 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:45:54 -07:00
Christopher Jones
3b38d14caf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:44:12 -07:00
Christopher Jones
9f44844d7c Change package.xml fix description 2012-09-13 22:43:10 -07:00
Christopher Jones
bbf5978e26 Fixed bug #60901 (Improve "tail" syntax for AIX installation) 2012-09-13 22:40:55 -07:00
Xinchen Hui
f6000a01e2 Capitalize the warning message 2012-09-11 18:09:47 +08:00
Xinchen Hui
79e6635cb6 Rearrange the codes, remove empty lines 2012-09-11 18:02:19 +08:00
Xinchen Hui
0146efbd41 Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src 2012-09-11 17:58:20 +08:00
Simon Welsh
e06c47ca2a Provide a specific error message if date.timezone value is invalid. 2012-09-11 21:45:09 +12:00
Xinchen Hui
7e64681740 Merge branch 'PHP-5.4' 2012-09-11 11:44:33 +08:00
Xinchen Hui
328a3d9f13 regenerate patch, and save a strlen 2012-09-11 11:43:47 +08:00
Xinchen Hui
b5c2f532af Merge branch 'PHP-5.4' 2012-09-10 23:11:28 +08:00
Xinchen Hui
0a25a0241e Fix the wrong use of snprintf which is introduced in 1d2f619049 2012-09-10 23:08:54 +08:00