Merge branch 'master' of https://git.php.net/repository/php-src
# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src:
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Initial PHP OCI8 2.0.0-dev commit.
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Adam Harvey [Tue, 23 Jul 2013 18:15:43 +0000 (11:15 -0700)]
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
fixed possible null deref
Disable a flag
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
updated test script for bug #65045.
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
...
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
fixed possible null deref
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
...
* pull-request/326:
zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
zend_API.h included ZVAL_* family in use
use Z_* family macros
zend_register_bool_constant patch
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
projects / php / log