cvs: php4(PHP_4_0_7) /ext/zlib zlib.c

sniper Mon Nov 12 18:16:00 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/zlib zlib.c Log: MFH Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.94.2.2 php4/ext/zlib/zlib.c:1.94.2.3 --- php4/ext/zlib/zlib.c:1.94.2.2 Thu Oct 11 19:52:15 2001 +++ php4/ext/zlib/zlib.c Mon Nov 12 18:16:00 2001 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.94.2.2 2001/10/11 23:52:15 ssb Exp $ */ +/* $Id: zlib.c,v 1.94.2.3 2001/11/12 23:16:00 sniper Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -131,8 +131,26 @@ 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