* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
I moved the constant to the enum in order to avoid this:
ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type
Works in gcc 4.6, but I'm not sure about other compilers.
* 'PHP-5.4' of git.php.net:php-src:
bump version
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
new for fix#65225Fixed#65225: PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.
This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.
Fixes bug #65458 (curl memory leak).
* 'PHP-5.4' of https://git.php.net/repository/php-src:
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
new for fix#65225Fixed#65225: PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h