summaryrefslogtreecommitdiff
path: root/ext/zlib/zlib.c
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2006-08-30 22:35:57 +0000
committerMichael Wallner <mike@php.net>2006-08-30 22:35:57 +0000
commit5de701d544be87ed3f6d63176a6821c69f9a08b3 (patch)
treeec907d521949c0b80dffc44f8757e162925426c1 /ext/zlib/zlib.c
parentd83fdc677ff86055b437d9c5157868aa4dde0962 (diff)
downloadphp-git-5de701d544be87ed3f6d63176a6821c69f9a08b3.tar.gz
- good bye ob_gzhandler
- ego promo
Diffstat (limited to 'ext/zlib/zlib.c')
-rw-r--r--ext/zlib/zlib.c9
1 files changed, 2 insertions, 7 deletions
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;