[PHP4BETA] CVS update: php4

Date: Monday May 10, 1999 @ 15:48 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv2758 Modified Files: SAPI.c cgi_main.c main.c php_globals.h Log Message: Weed out all BoundsChecker-found bugs Index: php4/SAPI.c diff -u php4/SAPI.c:1.14 php4/SAPI.c:1.15 --- php4/SAPI.c:1.14 Sun May 9 16:58:26 1999 +++ php4/SAPI.c Mon May 10 15:48:23 1999 @@ -94,7 +94,8 @@ SG(headers_sent) = 0; SG(read_post_bytes) = 0; if (SG(server_context)) { - if (!strcmp(SG(request_info).request_method, "POST")) { + if (SG(request_info).request_method + && !strcmp(SG(request_info).request_method, "POST")) { sapi_read_post_data(SLS_C); } else { SG(request_info).post_data = NULL; Index: php4/cgi_main.c diff -u php4/cgi_main.c:1.10 php4/cgi_main.c:1.11 --- php4/cgi_main.c:1.10 Sun May 9 14:40:59 1999 +++ php4/cgi_main.c Mon May 10 15:48:23 1999 @@ -436,6 +436,7 @@ php3_header(); /* Make sure headers have been sent */ php_request_shutdown((void *) 0); php_module_shutdown(); + tsrm_shutdown(); return SUCCESS; } Index: php4/main.c diff -u php4/main.c:1.50 php4/main.c:1.51 --- php4/main.c:1.50 Sun May 9 09:55:15 1999 +++ php4/main.c Mon May 10 15:48:23 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.50 1999/05/09 13:55:15 zeev Exp $ */ +/* $Id: main.c,v 1.51 1999/05/10 19:48:23 zeev Exp $ */ #include <stdio.h> @@ -470,7 +470,7 @@ { PLS_FETCH(); - php3_error(E_ERROR, "Maximum execution time of %d seconds exceeded", PG(max_execution_time)); + php3_error(E_ERROR, "Maximum execution time of %s seconds exceeded", INI_STRING("max_execution_time")); } #endif @@ -602,8 +602,6 @@ PG(unclean_shutdown) = 0; zend_output_startup(); - - php3_set_timeout(PG(max_execution_time)); #if APACHE /* Index: php4/php_globals.h diff -u php4/php_globals.h:1.11 php4/php_globals.h:1.12 --- php4/php_globals.h:1.11 Tue Apr 27 06:00:54 1999 +++ php4/php_globals.h Mon May 10 15:48:23 1999 @@ -37,7 +37,6 @@ char *safe_mode_exec_dir; long enable_dl; - long max_execution_time; long memory_limit; long track_errors; -- PHP 4 Beta