diff options
| author | Sascha Schumann <sas@php.net> | 2001-07-23 01:03:22 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-07-23 01:03:22 +0000 |
| commit | 36be1040ebdfbcf5dc7f266fb542649dd145d19f (patch) | |
| tree | 5a1c3e29009135910b6123620650a6d555b2061f /sapi/apache/mod_php4.c | |
| parent | e5204748f77e67f32a9159c193abdc4cec52ee72 (diff) | |
| download | php-git-36be1040ebdfbcf5dc7f266fb542649dd145d19f.tar.gz | |
Use synchronous php_request_shutdown in the standard case and
let the pool cleanup function only become effective, when an
error has occured.
This fixes the problem that the request_conn was already dead
when the request_shutdown was reached.
Diffstat (limited to 'sapi/apache/mod_php4.c')
| -rw-r--r-- | sapi/apache/mod_php4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 53ddb92d87..a58df34143 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -312,9 +312,11 @@ static void php_apache_request_shutdown(void *dummy) SLS_FETCH(); APLS_FETCH(); - AP(in_request)=0; SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */ - php_request_shutdown(dummy); + if (AP(in_request)) { + AP(in_request) = 0; + php_request_shutdown(dummy); + } } /* }}} */ |