diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:27:44 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-09-09 12:27:44 -0700 |
| commit | 024f3ac160228c9a7ace342b757cbd07934fa189 (patch) | |
| tree | a934ca7dae8205628b9e943285774728f91b667c | |
| parent | e5b27b9916adaae4a11d074b0a31c2fe9b3814e7 (diff) | |
| parent | c1de84014dbd541a0ce2d6730f996d59515a3932 (diff) | |
| download | php-git-024f3ac160228c9a7ace342b757cbd07934fa189.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fix for bug #76582
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index bf22d2c783..ec1d9728d2 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -689,6 +689,7 @@ zend_first_try { if (!parent_req) { 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); |