Xinchen Hui
1e942dde24
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-02 18:39:18 +08:00
Xinchen Hui
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
Yasuo Ohgaki
1c32b97bc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add user contributed test. Bug #61748
2013-08-02 09:52:50 +09:00
Yasuo Ohgaki
cb13f8318b
Add user contributed test. Bug #61748
2013-08-02 09:52:08 +09:00
Christopher Jones
d884ec15e9
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.
2013-08-01 09:19:53 -07:00
Christopher Jones
146b933ab4
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
...
This reverts commit 017145bc57
.
2013-08-01 08:47:13 -07:00
Christopher Jones
c069b5f571
Use PHP's major version when cleaning up Apache .module files
2013-07-31 12:35:10 -07:00
Christopher Jones
2ab080da2d
Merge branch 'phardistclean' into PHP-5.5
...
* phardistclean:
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:34:28 -07:00
Christopher Jones
017145bc57
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:31:50 -07:00
Christopher Jones
4ed18d5955
Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-07-31 11:49:29 -07:00
Christopher Jones
e3a4b87e89
Fixed bug #62691 (solaris sed has no -i switch)
...
Make 'make distclean' remove generated DTrace .h file
2013-07-31 09:58:28 -07:00
Christopher Jones
0625d5ce67
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
2013-07-31 09:01:56 -07:00
Christopher Jones
4590070f31
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 09:01:54 -07:00
Dmitry Stogov
5129892788
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:37:08 +04:00
Dmitry Stogov
4395f70207
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:36:06 +04:00
Dmitry Stogov
35872e101b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65018 (SoapHeader problems with SoapServer)
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Fixed bug #65336
Conflicts:
NEWS
2013-07-31 16:34:26 +04:00
Dmitry Stogov
fd8f454520
Fixed bug #65018 (SoapHeader problems with SoapServer)
2013-07-31 16:32:26 +04:00
Dmitry Stogov
d69b3d8f59
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
2013-07-31 14:20:56 +04:00
Rui Hirokawa
0a974f14d1
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 08:46:54 +09:00
Dmitry Stogov
d9e2dc8084
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 03:24:04 +04:00
Dmitry Stogov
f3aca8bc4d
Fixed php-5.2 support
2013-07-31 03:22:34 +04:00
Rui Hirokawa
f14ed5bce0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-07-31 08:18:51 +09:00
Rui Hirokawa
7da3315015
added test script for bug65045.
2013-07-31 08:18:39 +09:00
Rui Hirokawa
c10d7e1afc
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
2013-07-31 08:17:15 +09:00
Dmitry Stogov
2bd23530d8
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
2013-07-31 03:04:48 +04:00
Dmitry Stogov
02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
Christopher Jones
8ca04e51aa
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)
2013-07-30 13:39:20 -07:00
Dmitry Stogov
cb17c99511
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:31:37 +04:00
Dmitry Stogov
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
Dmitry Stogov
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
Dmitry Stogov
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
bafe0e5399
Update NEWS
2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
ef3d813d2c
Fixed bug #65336
2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
1d7b6970f2
Fixed bug #65336
2013-07-27 05:54:09 +09:00
Christopher Jones
8e79724c6f
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 :
2013-07-25 10:57:47 -07:00
Christopher Jones
fd616ba50f
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
2013-07-25 10:57:46 -07:00
Christopher Jones
4cab45946c
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 :
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:45 -07:00
Christopher Jones
29b2522df1
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:43 -07:00
Christopher Jones
42e8f3ca28
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
2013-07-25 08:53:29 -07:00
Christopher Jones
979194351d
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
2013-07-25 08:53:26 -07:00
Xinchen Hui
9776504c5b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:45:44 +08:00
Xinchen Hui
515092917d
Upper section name
2013-07-25 22:45:15 +08:00
Xinchen Hui
1fbcfc9bdb
Update NEWs
2013-07-25 22:44:59 +08:00
Xinchen Hui
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
Stanislav Malyshev
b8c8a04a85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
Stanislav Malyshev
96a53f6715
Merge branch 'bug65028' into PHP-5.4
...
* bug65028:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:44:06 -07:00
Adam Harvey
f9000fde98
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.
Fixes the fix for bug #61697 .
2013-07-23 11:15:43 -07:00
Anatol Belski
f00d796b7e
fix missing include
2013-07-23 18:06:51 +02:00
Johannes Schlüter
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00