Tree - rpms/php - CentOS Git server

Blob History Raw

		20017b	`From 809610f5ea38a83b284e1125d1fff129bdd615e7 Mon Sep 17 00:00:00 2001`
		20017b	`From: Stanislav Malyshev <stas@php.net>`
		20017b	`Date: Sat, 4 Apr 2015 15:03:46 -0700`
		20017b	`Subject: [PATCH] Fix bug #68486 and bug #69218 (segfault in apache2handler`
		20017b	`with apache 2.4)`
		20017b
		20017b	`---`
		20017b	`sapi/apache2handler/sapi_apache2.c \| 1 +`
		20017b	`1 file changed, 1 insertion(+)`
		20017b
		20017b	`diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c`
		20017b	`index e97f11c..cfebc5f 100644`
		20017b	`--- a/sapi/apache2handler/sapi_apache2.c`
		20017b	`+++ b/sapi/apache2handler/sapi_apache2.c`
		20017b	`@@ -688,6 +688,7 @@ zend_first_try {`
		20017b	`} zend_end_try();`
		20017b	`}`
		20017b	`apr_brigade_cleanup(brigade);`
		20017b	`+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);`
		20017b	`} else {`
		20017b	`ctx->r = parent_req;`
		20017b	`}`
		20017b	`--`
		20017b	`2.1.4`
		20017b