* 'master' of git.php.net:php-src: (641 commits)
fix unix/win dir separators
Fix bug #63173: Crash when invoking invalid array callback
compile out example plugin in a release build
change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options()
remove old unicode code, that is was compiled out by using a macro
Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Add NEWS/UPGRADING for previous change
Simplify set_error_handler/set_exception_handler code
Return previous error handler when resetting the error handler
Allow resetting the error handler
Revert error/exception handler changes
Fixed bug #63132
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Add CURLOPT_READDATA which was removed by mistake
Fixing NEWS file
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
...
* 'PHP-5.4' of git.php.net:php-src: (367 commits)
fix unix/win dir separators
Fix bug #63173: Crash when invoking invalid array callback
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Fixing NEWS file
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
Fix folding
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
Bug #63000: MCAST_JOIN_GROUP on OSX is broken
Fixed bug #61442 (exception threw in __autoload can not be catched)
Merging PR #116
Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
updated libary versions
split tests for the new zlib version on win
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
update news
Support building PHP with the native client toolchain.
...
The code did not check whether the zend_hash_index_find calls succeded,
so PHP crashed when an array callback was called that contains two elements
which don't have the indices 0 and 1.
* 'PHP-5.3' of git.php.net:php-src: (29 commits)
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
Fixed bug #61442 (exception threw in __autoload can not be catched)
updated libary versions
split tests for the new zlib version on win
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
test should fail
Fixed bug #63093 (Segfault while load extension failed in zts-build).
Add XFAIL test for bug #62852
Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
Change package.xml fix description
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
This will become 5.3.18
Update RELEASE PROCESS
fix NEWS after releses
Fix doc bug #63032 (Number of release in documentation).
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
...
set_error_handler(null) and set_exception_handler(null) now return the
previous error/exception handler instead of just returning bool(true).
This is consistent with the behavior of these functions with non-null
values.
This allows the error handler to be reset using set_error_handler(null).
As the code suggests this behavior was already previously intended, but
the callback check was done too strictly.
This reverts the following two commits:
* 6ba2e662e4
* d8f8e98d8e
Laruence already did some partial changes to set_error_handler and
set_exception_handler. I'm reverting those modifications to apply the full
set of changes. (The modifications changed the code structure in a way that
would lead to more duplication with the new behavior.)
EG(arg_types_stack) is now also backed up when generators are used. This
allows the use of yield in nested method calls.
This commit adds two new functions to the zend_ptr_stack API:
zend_ptr_stack_push_from_memory
zend_ptr_stack_pop_into_memory
both taking the following arguments:
zend_ptr_stack *stack, int count, void **pointers
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().
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.
