- good bye ob_gzhandler

- ego promo

diff --git a/ext/zlib/CREDITS b/ext/zlib/CREDITS
index c0a47dd2932d1d0f851eee0f0ee1fc868d8e94a3..a1773c463d1bfd3751b48eea3da1ce78621f5f13 100644 (file)
--- 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 61555f1e70f2affc2295c67719ade92e136aa6cc..6c54c4476cf646f928ebebac3c3d2460280218a4 100644 (file)
--- 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 0f48cc0475a3f8af4988c449ec08391515530d00..e0b4060c3a9998ca41ec3022a85715e3f867128c 100644 (file)
--- 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;