diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-10 19:48:23 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-10 19:48:23 +0000 |
| commit | 928e322038d9b7944c8e3d2a710fe3ac9975bde4 (patch) | |
| tree | 1d195139048551f6928e9cb2730d043b9e4a0172 /main | |
| parent | 8f48b83df4334d505a9f8881e32702922bb3484d (diff) | |
| download | php-git-928e322038d9b7944c8e3d2a710fe3ac9975bde4.tar.gz | |
Weed out all BoundsChecker-found bugs
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 3 | ||||
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | main/php_globals.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 91f47afc6b..b9f9e36e95 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -94,7 +94,8 @@ SAPI_API void sapi_activate(SLS_D) 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; diff --git a/main/main.c b/main/main.c index ef965528ff..65f38cd557 100644 --- a/main/main.c +++ b/main/main.c @@ -470,7 +470,7 @@ static void php3_timeout(int dummy) { 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 @@ -603,8 +603,6 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) zend_output_startup(); - php3_set_timeout(PG(max_execution_time)); - #if APACHE /* * For the Apache module version, this bit of code registers a cleanup diff --git a/main/php_globals.h b/main/php_globals.h index 48ad5441f7..0eae5e131c 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -37,7 +37,6 @@ struct _php_core_globals { char *safe_mode_exec_dir; long enable_dl; - long max_execution_time; long memory_limit; long track_errors; |