diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-12-20 10:49:33 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-12-20 10:49:33 +0000 |
| commit | 53b088e60c47655dccbc3a73daedb25ade2509ae (patch) | |
| tree | 76a7146c63212d058436d38564c7adc1fe64035e /sapi/apache2handler | |
| parent | 1e19ee87853fe519cee671038bd5eba0fe9cd8be (diff) | |
| download | php-git-53b088e60c47655dccbc3a73daedb25ade2509ae.tar.gz | |
Make MEMORY_LIMIT and ZEND_USE_MALLOC_MM to be always enabled. They don't make any significant slowdown, but incrise maintainability a lot. Note that the setting of memory_limit wasn't changes (neither in main/main.c nor in php.ini) and it still set to 16M.
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index a9deab7854..79b31c9be5 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -624,14 +624,9 @@ zend_first_try { } else { zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd); } -#if MEMORY_LIMIT - { - char *mem_usage; - mem_usage = apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC)); - apr_table_set(r->notes, "mod_php_memory_usage", mem_usage); - } -#endif + apr_table_set(r->notes, "mod_php_memory_usage", + apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC))); } } zend_end_try(); |