diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-04 15:03:46 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-11 16:53:21 -0700 |
| commit | 809610f5ea38a83b284e1125d1fff129bdd615e7 (patch) | |
| tree | 2dbd7144dae8d81ed8269e0986bb0bbc72711718 | |
| parent | f938112c495b0d26572435c0be73ac0bfe642ecd (diff) | |
| download | php-git-809610f5ea38a83b284e1125d1fff129bdd615e7.tar.gz | |
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
| -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 e97f11c69b..cfebc5f5c6 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -688,6 +688,7 @@ zend_first_try { } zend_end_try(); } apr_brigade_cleanup(brigade); + apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup); } else { ctx->r = parent_req; } |