com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_generators.c
| From: | Nikita Popov | Date: | Wed, 02 Jul 2014 15:36:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79203@lists.php.net to get a copy of this message | ||
Commit: 1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1
Author: Nikita Popov <nikic@php.net> Wed, 2 Jul 2014 17:35:03 +0200
Parents: 1163a7ce24850af498dd8f344cfbf44b7a063829 d9ebd0f3d696e42d7c7bd2b0176414534aed0ef1
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
MM Zend/zend_generators.c
Diff:
diff --cc NEWS
index 7481c7f,9bfa384..bf4bf60
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,20 +1,23 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.15
+?? ??? 2014, PHP 5.6.0 Release Candidate 3
+ - Core:
- . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
- code). (Adam)
- . Fixed bug #67436 (Autoloader isn't called if two method definitions don't
- 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
+ generator). (Nikita)
+
-- CLI server:
- . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
- (Adam)
++
+03 Jul 2014, PHP 5.6.0 Release Candidate 2
+
+- Core:
+ . Fixed bug #67368 (Memory leak with immediately dereferenced array in class
+ constant). (Laruence)
+ . Fixed bug #67468 (Segfault in highlight_file()/highlight_string()).
+ (Andreas Ferber)
+ . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
+ (Ferenc)
+ . Fixed bug #67498 (phpinfo() Type Confusion Information Leak Vulnerability).
+ (Stefan Esser)
- FPM:
. Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)