diff options
author | foobar <sniper@php.net> | 2001-11-12 23:16:00 +0000 |
---|---|---|
committer | foobar <sniper@php.net> | 2001-11-12 23:16:00 +0000 |
commit | f4671215161a00f9bd63ea9ab166b81c3366341b (patch) | |
tree | 2dec07152180552b1eca93d83d7c66f9493f3ccd | |
parent | 27592372cc8efb74827b3e27c81066bcccd69d41 (diff) | |
download | php-git-f4671215161a00f9bd63ea9ab166b81c3366341b.tar.gz |
MFH
-rw-r--r-- | ext/zlib/zlib.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 4a34226b33..12d070f34b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -131,8 +131,26 @@ ZEND_DECLARE_MODULE_GLOBALS(zlib) ZEND_GET_MODULE(php_zlib) #endif +/* {{{ OnUpdate_zlib_output_compression */ +static PHP_INI_MH(OnUpdate_zlib_output_compression) +{ + char *ini_value; + + ini_value = php_ini_string("output_handler", sizeof("output_handler"), 0); + if (ini_value != NULL && new_value != NULL && strlen(ini_value) != 0) { + php_error(E_CORE_ERROR,"Cannot use both zlib.output_compression and output_handler together!!"); + return FAILURE; + } + + OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + + return SUCCESS; +} +/* }}} */ + + PHP_INI_BEGIN() - STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdateInt, output_compression, zend_zlib_globals, zlib_globals) + STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdate_zlib_output_compression, output_compression, zend_zlib_globals, zlib_globals) PHP_INI_END() /* {{{ phpi_destructor_gzclose |