Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba

NEWS

@@ -33,6 +33,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)
+
 ?? ??? 2014, PHP 5.5.11
 
 - Core:

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();