fix http_exit_ex when zlib output compression is active

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index aebd434209deb323f2c2ba3dac0b73649f276222..4f1b7e387e9b6283d2d2c41bc459d02a39bae645 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -253,15 +253,9 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                return FAILURE;
        }
        
-#if PHP_VERSION_ID < 50399
-       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);
        }
-#else
-       if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) {
-               php_output_end_all(TSRMLS_C);
-       }
-#endif
        if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
                PHPWRITE(body, strlen(body));
        }