diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:38:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:39:32 -0700 |
| commit | 1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee (patch) | |
| tree | d725141bbc3ad5287ebc52491154129fcd28d993 | |
| parent | 3aab84c1008cddca9f4429c9079a94a52966eb07 (diff) | |
| parent | c5275b4a92fb9689d8d26112a9c3f91def201d35 (diff) | |
| download | php-git-1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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
@@ -24,6 +24,11 @@ PHP NEWS - SQLite: . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (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) + 10 Apr 2014, PHP 5.6.0 Beta 1 - Core: diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index cbf79a7fc1..a0c24bd0e3 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(); |