svn: /php/php-src/branches/PHP_5_3/main/ main.c
| From: | Rasmus Lerdorf | Date: | Sun, 15 Nov 2009 00:21:31 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/main/ main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60915@lists.php.net to get a copy of this message | ||
rasmus Sun, 15 Nov 2009 00:21:31 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290766
Log:
Fix bug #49868
As far as I can tell this was a copy-paste induced bug when I added
the reset_signals flag to zend_set_timeout.
Bug: http://bugs.php.net/49868 (Assigned) max_execution_time
affected by max_input_time
Changed paths:
U php/php-src/branches/PHP_5_3/main/main.c
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2009-11-15 00:13:19 UTC (rev 290765)
+++ php/php-src/branches/PHP_5_3/main/main.c 2009-11-15 00:21:31 UTC (rev 290766)
@@ -2226,7 +2226,7 @@
#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
#endif
- zend_set_timeout(EG(timeout_seconds), 0);
+ zend_set_timeout(INI_INT("max_execution_time"), 0);
}
retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file,
append_file_p) == SUCCESS);