iliaa Fri Aug 22 16:01:54 2003 EDT Modified files: /php-src/main main.c Log: Fixed bug #25127 (reset memory_limit before terminating the request) Index: php-src/main/main.c diff -u php-src/main/main.c:1.567 php-src/main/main.c:1.568 --- php-src/main/main.c:1.567 Wed Aug 20 19:00:08 2003 +++ php-src/main/main.c Fri Aug 22 16:01:53 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.567 2003/08/20 23:00:08 zeev Exp $ */ +/* $Id: main.c,v 1.568 2003/08/22 20:01:53 iliaa Exp $ */ /* {{{ includes */ @@ -116,14 +116,12 @@ */ static PHP_INI_MH(OnChangeMemoryLimit) { - int new_limit; - if (new_value) { - new_limit = zend_atoi(new_value, new_value_length); + PG(memory_limit) = zend_atoi(new_value, new_value_length); } else { - new_limit = 1<<30; /* effectively, no limit */ + PG(memory_limit) = 1<<30; /* effectively, no limit */ } - return zend_set_memory_limit(new_limit); + return zend_set_memory_limit(PG(memory_limit)); } /* }}} */ #endif @@ -741,6 +739,10 @@ case E_USER_ERROR: EG(exit_status) = 255; if (module_initialized) { +#if MEMORY_LIMIT + /* restore memory limit */ + AG(memory_limit) = PG(memory_limit); +#endif zend_bailout(); efree(buffer); return;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php