From: Stanislav Malyshev <stas@php.net>
Date: Sun, 13 Apr 2014 22:37:19 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5275b4a92fb9689d8d26112a9c3f91def201d35;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
---

c5275b4a92fb9689d8d26112a9c3f91def201d35
diff --cc NEWS
index b08e875d3b,25d093f50a..988408154c
--- a/NEWS
+++ b/NEWS
@@@ -33,24 -26,18 +33,29 @@@ PH
    . Fixed bug #53965 (<xsl:include> cannot find files with relative paths
      when loaded with "file://"). (Anatol)
  
+ - Apache2 Handler SAPI:
 -  . Fixed Apache log issue caused by APR's lack of support for %zu 
++  . Fixed Apache log issue caused by APR's lack of support for %zu
+     (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
+     (Jeff Trawick)
+ 
 -03 Apr 2014, PHP 5.4.27
 +?? ??? 2014, PHP 5.5.11
  
  - Core:
 +  . Allow zero length comparison in substr_compare() (Tjerk)
    . Fixed bug #60602 (proc_open() changes environment array) (Tjerk)
  
 +- SPL:
 +  . Added feature #65545 (SplFileObject::fread()) (Tjerk)
 +  . Fixed bug #66702 (RegexIterator::INVERT_MATCH does not invert). (Joshua
 +    Thijssen)
 +
 +- cURL:
 +  . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) (Tjerk)
 +  . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive.
 +    (Adam)
 +
  - Fileinfo:
 -  . Fixed bug #66946 (fileinfo: extensive backtracking in awk rule regular
 +  . Fixed bug #66946i (fileinfo: extensive backtracking in awk rule regular
      expression). (CVE-2013-7345) (Remi)
  
  - FPM: