From: Xinchen Hui <laruence@php.net>
Date: Sun, 6 May 2012 12:06:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cceeb25b74eb89ff8d4106d1b195a1c18fc94d8;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
---

4cceeb25b74eb89ff8d4106d1b195a1c18fc94d8
diff --cc NEWS
index 8b82237849,c2b10e50dd..f88bf70aec
--- a/NEWS
+++ b/NEWS
@@@ -14,18 -11,10 +14,20 @@@ PH
      (Laruence)
  
  - Core:
+   . Fixed bug #61730 (Segfault from array_walk modifying an array passed by
+     reference). (Laruence)
 +  . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
 +    (Laruence)
    . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
 -  . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
 +  . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy)
 +  . Fixed bug #61761 ('Overriding' a private static method with a different 
 +    signature causes crash). (Laruence)
 +  . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown 
 +    phase). (Laruence)
 +  . Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
 +  . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
 +    (without apache2)). (Laruence)
 +  . Fixed bug #61605 (header_remove() does not remove all headers). (Laruence)
    . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
      set to null). (Anatoliy)