cvs: php4 /main main.c
| From: | Zeev Suraski | Date: | Mon, 19 Nov 2001 14:59:38 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8254@lists.php.net to get a copy of this message | ||
zeev Mon Nov 19 09:59:38 2001 EDT
Modified files:
/php4/main main.c
Log:
Fix set_time_limit() to affect only the current request (fix bug #13711)
Index: php4/main/main.c
diff -u php4/main/main.c:1.410 php4/main/main.c:1.411
--- php4/main/main.c:1.410 Sat Oct 6 16:13:38 2001
+++ php4/main/main.c Mon Nov 19 09:59:38 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.410 2001/10/06 20:13:38 derick Exp $ */
+/* $Id: main.c,v 1.411 2001/11/19 14:59:38 zeev Exp $ */
/* {{{ includes
*/
@@ -506,9 +506,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(new_timeout);
- zend_unset_timeout(TSRMLS_C);
- zend_set_timeout(Z_LVAL_PP(new_timeout));
+ convert_to_string_ex(new_timeout);
+ zend_alter_ini_entry("max_execution_time", sizeof("max_execution_time"),
Z_STRVAL_PP(new_timeout), Z_STRLEN_PP(new_timeout), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
}
/* }}} */