iliaa Fri Aug 22 16:02:12 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main main.c
Log:
MFH: Fixed bug #25127 (reset memory_limit before terminating the request)
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.45 php-src/main/main.c:1.512.2.46
--- php-src/main/main.c:1.512.2.45 Sat Aug 9 19:15:19 2003
+++ php-src/main/main.c Fri Aug 22 16:02:11 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.45 2003/08/09 23:15:19 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.46 2003/08/22 20:02:11 iliaa Exp $ */
/* {{{ includes
*/
@@ -150,14 +150,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
@@ -702,6 +700,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
