diff options
| author | Andrey Hristov <andrey@php.net> | 1999-05-10 20:41:42 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 1999-05-10 20:41:42 +0000 |
| commit | ea0f19850e26477918736c617d51e624928f9d00 (patch) | |
| tree | 9f3f40931f5b856ac7041f71473a4a4397be635b | |
| parent | 928e322038d9b7944c8e3d2a710fe3ac9975bde4 (diff) | |
| download | php-git-ea0f19850e26477918736c617d51e624928f9d00.tar.gz | |
A couple of fixes.
| -rw-r--r-- | cgi_main.c | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cgi_main.c b/cgi_main.c index a7c01c7f07..a73b427e01 100644 --- a/cgi_main.c +++ b/cgi_main.c @@ -436,7 +436,9 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine php3_header(); /* Make sure headers have been sent */ php_request_shutdown((void *) 0); php_module_shutdown(); +#ifdef ZTS tsrm_shutdown(); +#endif return SUCCESS; } diff --git a/main/main.c b/main/main.c index 65f38cd557..1f3303304d 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 %s seconds exceeded", INI_STRING("max_execution_time")); + php3_error(E_ERROR, "Maximum execution time of %s seconds exceeded", INI_STR("max_execution_time")); } #endif |