diff options
| author | Michael Wallner <mike@php.net> | 2012-05-15 09:44:01 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2012-05-15 09:44:01 +0200 |
| commit | 2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0 (patch) | |
| tree | 36c82c946ba41417058648217232b8fc414050eb /ext | |
| parent | d03900dc92af6d47921143f226217eae3ca564b7 (diff) | |
| parent | 0ad53bfd7da12a92a46c08e3fff579a15026b88b (diff) | |
| download | php-git-2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0.tar.gz | |
cleanup merge
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 283ac5a166..81a6361dd4 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -284,7 +284,8 @@ static void php_zlib_output_compression_start(TSRMLS_D) ZLIBG(output_compression) = PHP_OUTPUT_HANDLER_DEFAULT_SIZE; /* break omitted intentionally */ default: - if ( (h = php_zlib_output_handler_init(ZEND_STRL(PHP_ZLIB_OUTPUT_HANDLER_NAME), ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC)) && + if ( php_zlib_output_encoding(TSRMLS_C) && + (h = php_zlib_output_handler_init(ZEND_STRL(PHP_ZLIB_OUTPUT_HANDLER_NAME), ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC)) && (SUCCESS == php_output_handler_start(h TSRMLS_CC))) { if (ZLIBG(output_handler) && *ZLIBG(output_handler)) { MAKE_STD_ZVAL(zoh); @@ -966,8 +967,6 @@ static PHP_RINIT_FUNCTION(zlib) static PHP_RSHUTDOWN_FUNCTION(zlib) { - ZLIBG(output_compression) = 0; - php_zlib_cleanup_ob_gzhandler_mess(TSRMLS_C); return SUCCESS; |