[PHP-CVS] cvs: php-src /main main.c /sapi/cli php_cli.c

[Dmitry Stogov]

dmitry          Thu May 11 22:08:55 2006 UTC

  Modified files:              
    /php-src/main       main.c 
    /php-src/sapi/cli   php_cli.c 
  Log:
  Fixed bug #37306 (max_execution_time = max_input_time).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.687&r2=1.688&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.687 php-src/main/main.c:1.688
--- php-src/main/main.c:1.687   Thu May 11 07:55:48 2006
+++ php-src/main/main.c Thu May 11 22:08:55 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.687 2006/05/11 07:55:48 helly Exp $ */
+/* $Id: main.c,v 1.688 2006/05/11 22:08:55 dmitry Exp $ */
 
 /* {{{ includes
  */
@@ -1871,11 +1871,11 @@
                } 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);
 
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.152&r2=1.153&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.152 php-src/sapi/cli/php_cli.c:1.153
--- php-src/sapi/cli/php_cli.c:1.152    Sat Apr 29 14:53:26 2006
+++ php-src/sapi/cli/php_cli.c  Thu May 11 22:08:55 2006
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.152 2006/04/29 14:53:26 fmk Exp $ */
+/* $Id: php_cli.c,v 1.153 2006/05/11 22:08:55 dmitry Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -111,8 +111,8 @@
        "register_argc_argv=1\n"        \
        "implicit_flush=1\n"            \
        "output_buffering=0\n"          \
-       "max_execution_time=0\n"
-
+       "max_execution_time=0\n"        \
+       "max_input_time=-1\n"
 
 static char *php_optarg = NULL;
 static int php_optind = 1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php