From: Michael Wallner <mike@php.net>
Date: Thu, 24 Mar 2011 09:53:35 +0000 (+0000)
Subject: fix http_exit_ex when zlib output compression is active
X-Git-Tag: RELEASE_1_7_1~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ac73b47af7c48397dc9a6e07872062b3c3619813;p=m6w6%2Fext-http

fix http_exit_ex when zlib output compression is active
---

diff --git a/http_api.c b/http_api.c
index aca90e6..4f1b7e3 100644
--- a/http_api.c
+++ b/http_api.c
@@ -253,7 +253,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 	
-	if (!OG(ob_lock)) {
+	if (!php_ob_handler_used("zlib output compression") && !php_ob_handler_used("ob_gzhandler") && !OG(ob_lock)) {
 		php_end_ob_buffers(0 TSRMLS_CC);
 	}
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {