com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/standard/string.c
| From: | Nikita Popov | Date: | Wed, 02 Jul 2014 20:34:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79209@lists.php.net to get a copy of this message | ||
Commit: 8c4156ed28e56b8b97e3ddfc7e4320f6103e7dbe
Author: Nikita Popov <nikic@php.net> Wed, 2 Jul 2014 22:33:57 +0200
Parents: d9ebd0f3d696e42d7c7bd2b0176414534aed0ef1 3cc6bd10acdec14dc28bce1f39689bc99add4514
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8c4156ed28e56b8b97e3ddfc7e4320f6103e7dbe
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM NEWS
MM ext/standard/string.c
Diff:
diff --cc NEWS
index 9bfa384,44196a3..4f9ed4d
--- a/NEWS
+++ b/NEWS
@@@ -9,8 -9,7 +9,9 @@@ PH
match). (Bob)
. Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
(Ferenc)
- . Fixed buf #67497 (eval with parse error causes segmentation fault in
++ . Fixed bug #67497 (eval with parse error causes segmentation fault in
+ generator). (Nikita)
+ . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
- CLI server:
. Implemented FR #67429 (CLI server is missing some new HTTP response codes).