diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-05-11 22:10:31 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-05-11 22:10:31 +0000 |
| commit | 1f41b288e9bca992262f2fefcee0e427aca3d7c0 (patch) | |
| tree | c59622bc652a8a3ee8da9a8b0e72ca20b7c8cd48 /main | |
| parent | b8c7ecc0610aea509db01302e9fcad7f00604533 (diff) | |
| download | php-git-1f41b288e9bca992262f2fefcee0e427aca3d7c0.tar.gz | |
Fixed bug #37306 (max_execution_time = max_input_time)
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index 55b3d4dbfc..ab35f2ec3d 100644 --- a/main/main.c +++ b/main/main.c @@ -1729,11 +1729,11 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) } else { append_file_p = NULL; } - if (PG(max_input_time) == -1) { + if (PG(max_input_time) != -1) { #ifdef PHP_WIN32 zend_unset_timeout(TSRMLS_C); #endif - zend_set_timeout(EG(timeout_seconds)); + zend_set_timeout(INI_INT("max_execution_time")); } retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS); |