diff options
author | Jeff Trawick <trawick@gmail.com> | 2014-04-13 16:37:16 -0400 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:36:43 -0700 |
commit | 442264ffd6c12eb5278f64ef6554d7fd0780d3fe (patch) | |
tree | e2968d63ba067033fb8cbaedbe11739b178c43b2 | |
parent | 1010200da5da81642bec89d9c90d001478e3554d (diff) | |
download | php-git-442264ffd6c12eb5278f64ef6554d7fd0780d3fe.tar.gz |
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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(); |