com php-src: fix apr_psprintf format string from e0 df4e3dba7c4ab92442b9e82c1de01fdba a3cce: NEWS sapi/apache2handler/sapi_apache2.c

Commit: 442264ffd6c12eb5278f64ef6554d7fd0780d3fe Author: Jeff Trawick <trawick@gmail.com> Sun, 13 Apr 2014 16:37:16 -0400 Committer: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 15:36:43 -0700 Parents: 1010200da5da81642bec89d9c90d001478e3554d Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=442264ffd6c12eb5278f64ef6554d7fd0780d3fe Log: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce Changed paths: M NEWS M sapi/apache2handler/sapi_apache2.c Diff: diff --git a/NEWS b/NEWS index 4d5441e..25d093f 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 d2b3a32..e97f11c 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();