* PHP-5.5:
Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
Clean up the 'generated' phar.inc file.
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Fixed php-5.2 support
added test script for bug65045.
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Added support for glob symbols in blacklist entries (?, *, **)
Fixed bug #65336
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Fixed php-5.2 support
added test script for bug65045.
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Added support for glob symbols in blacklist entries (?, *, **)
Fixed bug #65336
* PHP-5.5:
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
added test script for bug65045.
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
* 'master' of git.php.net:php-src:
Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
A minor fix for configure outpu (Tony)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
A minor fix for configure outpu (Tony)
Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
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
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
Fix compiler warning on redefined constant
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.
projects / php / log