Merge branch 'PHP-5.5' into PHP-5.6

diff --cc NEWS
index 1fefe0eea4a23ced514dfcb5d950f0597f5ef72d,4f9ed4dd9feb042f1d49aad90664c2725a89babc..acddf29e466d37b02076d7e2a4090ee3dfe5423e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,26 -1,21 +1,27 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.15
 +?? ??? 2014, PHP 5.6.0 Release Candidate 3
  
  - Core:
-   . Fixed buf #67497 (eval with parse error causes segmentation fault in
 -  . 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 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).
 -    (Adam)
 +- pgsql:
 +  . Fix bug #67555 (Cannot build against libpq 7.3). (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)

diff --cc ext/standard/string.c
Simple merge