diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-04-07 11:44:03 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-04-07 11:44:03 +0000 |
| commit | ead7652457b9add204a1bd372a197afe134ba662 (patch) | |
| tree | 80258d1d6dfe26f108f880b65a6c003575f46e73 | |
| parent | 6624682dff3b3109f4a38db9973785285c315b92 (diff) | |
| download | php-git-ead7652457b9add204a1bd372a197afe134ba662.tar.gz | |
We don't need setup the same time-out two times.
| -rw-r--r-- | main/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index 4515e02c69..05612e664c 100644 --- a/main/main.c +++ b/main/main.c @@ -1719,10 +1719,12 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) } else { append_file_p = NULL; } + if (PG(max_input_time) == -1) { #ifdef PHP_WIN32 - zend_unset_timeout(TSRMLS_C); + zend_unset_timeout(TSRMLS_C); #endif - zend_set_timeout(INI_INT("max_execution_time")); + zend_set_timeout(EG(timeout_seconds)); + } retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS); } zend_end_try(); |