com php-src: Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4): sapi/apache2handler/sapi_apache2.c
| From: | Stanislav Malyshev | Date: | Sat, 11 Apr 2015 23:53:21 +0000 |
| Subject: | com php-src: Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4): sapi/apache2handler/sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86187@lists.php.net to get a copy of this message | ||
Commit: 809610f5ea38a83b284e1125d1fff129bdd615e7
Author: Stanislav Malyshev <stas@php.net> Sat, 4 Apr 2015 15:03:46 -0700
Parents: f938112c495b0d26572435c0be73ac0bfe642ecd
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=809610f5ea38a83b284e1125d1fff129bdd615e7
Log:
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Bugs:
https://bugs.php.net/68486
https://bugs.php.net/69218
Changed paths:
M sapi/apache2handler/sapi_apache2.c
Diff:
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index e97f11c..cfebc5f 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;
}