Make MEMORY_LIMIT and ZEND_USE_MALLOC_MM to be always enabled. They don't make a

ny 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.
This commit is contained in:
Dmitry Stogov 2006-12-20 10:50:46 +00:00
parent 460360ae53
commit a7c536fbcd
12 changed files with 25 additions and 167 deletions

View file

@ -619,14 +619,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();