summaryrefslogtreecommitdiff
path: root/ext/zlib/zlib.c
diff options
context:
space:
mode:
authorRui Hirokawa <hirokawa@php.net>2001-11-23 02:53:16 +0000
committerRui Hirokawa <hirokawa@php.net>2001-11-23 02:53:16 +0000
commit506eec88b439982994b290f171a75a6fddb91828 (patch)
treece2639457d66e355a51a2fbbeb9cad743d6504e5 /ext/zlib/zlib.c
parent062713a58d5b5fd0fe72e4892995108b410618c9 (diff)
downloadphp-git-506eec88b439982994b290f171a75a6fddb91828.tar.gz
restriction is relaxed because output handler couldn't be used even if zlib.output_compression is set to off.
Diffstat (limited to 'ext/zlib/zlib.c')
-rw-r--r--ext/zlib/zlib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index bd7d6e5168..54f5128894 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -137,7 +137,8 @@ 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) {
+ 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;
}