From: Stanislav Malyshev <stas@php.net>
Date: Mon, 24 Nov 2014 00:22:52 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a3e236bd5f40d17812b4da23ef19a4f4f67abc6;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix NEWS order
---

5a3e236bd5f40d17812b4da23ef19a4f4f67abc6
diff --cc NEWS
index af4ce9b757,1f83b03a4d..3f88891689
--- a/NEWS
+++ b/NEWS
@@@ -1,17 -1,17 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.20
 +?? ??? 2014, PHP 5.6.4
  
  - Core:
-   . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
+   . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
+     (Adam)
 -  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly 
 -    triggered). (Julien)
 +  . Fixed bug #68104 (Segfault while pre-evaluating a disabled function).
 +    (Laruence)
++  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien)
 +  . Fixed bug #68355 (Inconsistency in example php.ini comments).
 +    (Chris McCafferty)
-   . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien)
+   . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
 +  . Fixed bug #68446 (Array constant not accepted for array parameter default). (Bob)
  
  - FPM:
+   . Fixed bug #68381 (fpm_unix_init_main ignores log_level).
+     (David Zuelke, Remi)
    . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all
      addresses). (Remi)
    . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi)