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/apache_hooks/mod_php5.c | |
| 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/apache_hooks/mod_php5.c')
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 7d46ce62d9..33b43e77f0 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -736,16 +736,10 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) static int send_parsed_php(request_rec * r) { int result = send_php(r, 0, NULL); - -#if MEMORY_LIMIT - { - char *mem_usage; - TSRMLS_FETCH(); + TSRMLS_FETCH(); - mem_usage = ap_psprintf(r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC)); - ap_table_setn(r->notes, "mod_php_memory_usage", mem_usage); - } -#endif + ap_table_setn(r->notes, "mod_php_memory_usage", + ap_psprintf(r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC))); return result; } |