mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
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:
parent
e5204748f7
commit
36be1040eb
2 changed files with 10 additions and 5 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue