From: Jeff Trawick <trawick@gmail.com>
Date: Sun, 13 Apr 2014 20:37:16 +0000 (-0400)
Subject: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
X-Git-Tag: php-5.5.12RC1~15^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=442264ffd6c12eb5278f64ef6554d7fd0780d3fe;p=php

fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
---

diff --git a/NEWS b/NEWS
index 4d5441e28e..25d093f50a 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,11 @@ PHP                                                                        NEWS
   . 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)
+
 03 Apr 2014, PHP 5.4.27
 
 - Core:
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index d2b3a327ff..e97f11c69b 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -670,7 +670,7 @@ zend_first_try {
 		}
 
 		apr_table_set(r->notes, "mod_php_memory_usage",
-			apr_psprintf(ctx->r->pool, "%zu", zend_memory_peak_usage(1 TSRMLS_CC)));
+			apr_psprintf(ctx->r->pool, "%" APR_SIZE_T_FMT, zend_memory_peak_usage(1 TSRMLS_CC)));
 	}
 
 } zend_end_try();