diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-11-17 21:01:13 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-11-17 21:01:13 +0000 |
| commit | 85bf21aba8caa58fe1afb2e2d9281960ebb8d488 (patch) | |
| tree | 64eebfc519f48361d1d52b12a5098f67ee22ecea /sapi/apache2handler | |
| parent | f1d215372820d53080e4171fcf9b389e5f529416 (diff) | |
| download | php-git-85bf21aba8caa58fe1afb2e2d9281960ebb8d488.tar.gz | |
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 19f655273e..b4b3d4179c 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -457,6 +457,7 @@ static int php_handler(request_rec *r) if (strcmp(r->protocol, "INCLUDED")) { \ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \ } \ + apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup); \ conf = ap_get_module_config(r->per_dir_config, &php4_module); |