Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)

smalyshev · smalyshev · commit 809610f5ea38 · 2015-04-11T16:53:21.000-07:00
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -688,6 +688,7 @@ zend_first_try {`
`688`	`688`	`} zend_end_try();`
`689`	`689`	`}`
`690`	`690`	`apr_brigade_cleanup(brigade);`
	`691`	`+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);`
`691`	`692`	`} else {`
`692`	`693`	`ctx->r = parent_req;`
`693`	`694`	`}`