From: Stanislav Malyshev <stas@php.net>
Date: Sun, 9 Sep 2018 19:27:44 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.32~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=024f3ac160228c9a7ace342b757cbd07934fa189;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS
  Fix for bug #76582
---

024f3ac160228c9a7ace342b757cbd07934fa189
diff --cc sapi/apache2handler/sapi_apache2.c
index bf22d2c783,0ebca9bca8..ec1d9728d2
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@@ -687,8 -676,9 +687,9 @@@ zend_first_try 
  } zend_end_try();
  
  	if (!parent_req) {
 -		php_apache_request_dtor(r TSRMLS_CC);
 +		php_apache_request_dtor(r);
  		ctx->request_processed = 1;
+ 		apr_brigade_cleanup(brigade);
  		bucket = apr_bucket_eos_create(r->connection->bucket_alloc);
  		APR_BRIGADE_INSERT_TAIL(brigade, bucket);