com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS sapi/apache2handler/sapi_apache2.c

Commit: 1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 15:38:20 -0700 Parents: 3aab84c1008cddca9f4429c9079a94a52966eb07 c5275b4a92fb9689d8d26112a9c3f91def201d35 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce Changed paths: MM NEWS MM sapi/apache2handler/sapi_apache2.c Diff: diff --cc NEWS index e81c17b,9884081..ea7e0c0 --- a/NEWS +++ b/NEWS @@@ -24,7 -29,16 +24,12 @@@ PH - SQLite: . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol) -- XSL: - . 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 + (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120). + (Jeff Trawick) + -?? ??? 2014, PHP 5.5.11 +10 Apr 2014, PHP 5.6.0 Beta 1 - Core: . Allow zero length comparison in substr_compare() (Tjerk)