diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2002-11-17 22:52:47 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2002-11-17 22:52:47 +0000 |
| commit | f14b742392d0e5cdc30cf5991e4f9bd09fc2b499 (patch) | |
| tree | d11508d275495dcb825a5141bfca5bff74d8da6e | |
| parent | 8d00d54f2fc6d429c1c9779e6891c649a18407b6 (diff) | |
| download | php-git-f14b742392d0e5cdc30cf5991e4f9bd09fc2b499.tar.gz | |
Fixed bug #20466.
| -rw-r--r-- | main/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index f323f3e1fb..5cf1ac2ef2 100644 --- a/main/main.c +++ b/main/main.c @@ -79,6 +79,7 @@ #include "zend_highlight.h" #include "zend_indent.h" #include "zend_extensions.h" +#include "zend_ini.h" #include "php_content_types.h" #include "php_ticks.h" @@ -1544,7 +1545,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) php_mb_set_zend_encoding(TSRMLS_C); #endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */ zend_unset_timeout(TSRMLS_C); - 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); if (old_primary_file_path) { |