cvs: php4 /ext/zlib zlib.c

hirokawa Thu Nov 22 21:53:16 2001 EDT Modified files: /php4/ext/zlib zlib.c Log: restriction is relaxed because output handler couldn't be used even if zlib.output_compression is set to off. Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.102 php4/ext/zlib/zlib.c:1.103 --- php4/ext/zlib/zlib.c:1.102 Sat Oct 27 14:22:56 2001 +++ php4/ext/zlib/zlib.c Thu Nov 22 21:53:16 2001 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.102 2001/10/27 18:22:56 derick Exp $ */ +/* $Id: zlib.c,v 1.103 2001/11/23 02:53:16 hirokawa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -137,7 +137,8 @@ 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) { + if (ini_value != NULL && strlen(ini_value) != 0 && + new_value != NULL && strlen(new_value) != 0 ) { php_error(E_CORE_ERROR,"Cannot use both zlib.output_compression and output_handler together!!"); return FAILURE; }