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.
This commit is contained in:
Sascha Schumann 2001-07-23 01:03:22 +00:00
parent e5204748f7
commit 36be1040eb
2 changed files with 10 additions and 5 deletions

View file

@ -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);
}
}
/* }}} */