com php-src: Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4): sapi/apache2handler/sapi_apache2.c
| From: | JulienPauli | Date: | Wed, 15 Apr 2015 08:11:04 +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-86270@lists.php.net to get a copy of this message | ||
Commit: 01883bcffb682f34309f9fbf112eecb050559522
Author: Stanislav Malyshev <stas@php.net> Sat, 4 Apr 2015 15:03:46 -0700
Committer: Julien Pauli <jpauli@php.net> Wed, 15 Apr 2015 10:11:04 +0200
Parents: f678693e1a6950cae08a99cd145d5d0dc24f92bb
Branches: PHP-5.5.24
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01883bcffb682f34309f9fbf112eecb050559522
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 088ff77..840c550 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;
}