From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 15:35:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~133^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1
diff --cc NEWS
index 7481c7f0a1,9bfa384e82..bf4bf60048
--- 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)