diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:40:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:40:21 -0700 |
| commit | 9fb92eed83e1521f4f4c03c60ade6386a37d8a78 (patch) | |
| tree | ef0fc9357cc4828e4347cb45c7bfe11ca4b7f46b /sapi/apache2handler/sapi_apache2.c | |
| parent | 12844292b872f73c6bdec13d7832f04932662567 (diff) | |
| parent | 1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee (diff) | |
| download | php-git-9fb92eed83e1521f4f4c03c60ade6386a37d8a78.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 56faee3c66..dfb5eac28a 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -669,7 +669,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(); |