]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sun, 9 Sep 2018 19:27:44 +0000 (12:27 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 9 Sep 2018 19:27:44 +0000 (12:27 -0700)
* PHP-5.6:
  Update NEWS
  Fix for bug #76582

1  2 
sapi/apache2handler/sapi_apache2.c

index bf22d2c783ea47b9dc97c84a60a8dee471e2470f,0ebca9bca863909aef3fd3417bb3baad1605df34..ec1d9728d2f519a2d5f1c6e6164c9df56b562404
@@@ -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);