dmitry Thu May 11 22:11:17 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/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/NEWS?r1=1.2027.2.551&r2=1.2027.2.552&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.551 php-src/NEWS:1.2027.2.552
--- php-src/NEWS:1.2027.2.551 Wed May 10 10:08:23 2006
+++ php-src/NEWS Thu May 11 22:11:17 2006
@@ -7,6 +7,7 @@
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
- Fixed bug #37360 (invalid gif size) (Pierre)
+- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
04 May 2006, PHP 5.1.4
- Added "capture_peer_cert" and "capture_peer_cert_chain" context options
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23&r2=1.640.2.24&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23 php-src/main/main.c:1.640.2.24
--- php-src/main/main.c:1.640.2.23 Wed Apr 12 12:49:39 2006
+++ php-src/main/main.c Thu May 11 22:11:17 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23 2006/04/12 12:49:39 tony2001 Exp $ */
+/* $Id: main.c,v 1.640.2.24 2006/05/11 22:11:17 dmitry Exp $ */
/* {{{ includes
*/
@@ -1723,11 +1723,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.129.2.13&r2=1.129.2.14&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13
php-src/sapi/cli/php_cli.c:1.129.2.14
--- php-src/sapi/cli/php_cli.c:1.129.2.13 Tue Feb 21 21:15:13 2006
+++ php-src/sapi/cli/php_cli.c Thu May 11 22:11:17 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.13 2006/02/21 21:15:13 johannes Exp $ */
+/* $Id: php_cli.c,v 1.129.2.14 2006/05/11 22:11:17 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -708,6 +708,7 @@
INI_HARDCODED("implicit_flush", "1");
INI_HARDCODED("output_buffering", "0");
INI_HARDCODED("max_execution_time", "0");
+ INI_HARDCODED("max_input_time", "-1");
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg,
&php_optind, 0)) != -1) {
switch (c) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
