From: Xinchen Hui <laruence@php.net>
Date: Mon, 24 Jun 2013 15:49:30 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_API.c
---

a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da
diff --cc NEWS
index 0a57834b75,2dbe468d4d..a777e8d7f3
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,12 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.18
 +?? ??? 2013, PHP 5.5.1
  
  - Core:
 -  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
 -    (David Soria Parra, Laruence)
    . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
      (Adam)
-   . Fixed bug #65108 (is_callable() triggers Fatal Error). (David Soria Parra)
++  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
++    (David Soria Parra, Laruence)
 +
 +OPcache
 +  . OPcache must be compatible with LiteSpeed SAPI (Dmitry)
  
  - CLI server:
    . Fixed bug #65066 (Cli server not responsive when responding with 422 http