diff options
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/CREDITS | 2 | ||||
| -rw-r--r-- | ext/zlib/php_zlib.h | 3 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/ext/zlib/CREDITS b/ext/zlib/CREDITS index c0a47dd293..a1773c463d 100644 --- a/ext/zlib/CREDITS +++ b/ext/zlib/CREDITS @@ -1,2 +1,2 @@ Zlib -Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti +Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 61555f1e70..6c54c4476c 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -14,6 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | | Stefan Röhrich <sr@linux.de> | + | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -79,8 +80,6 @@ PHP_FUNCTION(gzfile); PHP_FUNCTION(gzopen); PHP_FUNCTION(readgzfile); -PHP_FUNCTION(ob_gzhandler); - PHP_FUNCTION(gzcompress); PHP_FUNCTION(gzuncompress); PHP_FUNCTION(gzdeflate); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 0f48cc0475..e0b4060c3a 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -16,6 +16,7 @@ | Stefan Röhrich <sr@linux.de> | | Zeev Suraski <zeev@zend.com> | | Jade Nicoletti <nicoletti@nns.ch> | + | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -587,11 +588,6 @@ PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP); PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE); /* }}} */ -PHP_FUNCTION(ob_gzhandler) -{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_gzhandler is intended to be used with ob_start()"); -} - #ifdef COMPILE_DL_ZLIB ZEND_GET_MODULE(php_zlib) #endif @@ -619,7 +615,6 @@ zend_function_entry php_zlib_functions[] = { PHP_FE(gzinflate, NULL) PHP_FE(gzencode, NULL) PHP_FE(gzdecode, NULL) - PHP_FE(ob_gzhandler, NULL) PHP_FE(zlib_encode, NULL) PHP_FE(zlib_decode, NULL) PHP_FE(zlib_get_coding_type, NULL) @@ -654,8 +649,8 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression) return FAILURE; } - status = php_output_get_status(TSRMLS_C); if (stage == PHP_INI_STAGE_RUNTIME) { + status = php_output_get_status(TSRMLS_C); if (status & PHP_OUTPUT_SENT) { php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot change zlib.output_compression - headers already sent"); return FAILURE; |