]> granicus.if.org Git - php/commitdiff
restriction is relaxed because output handler couldn't be used even if zlib.output_co...
authorRui Hirokawa <hirokawa@php.net>
Fri, 23 Nov 2001 02:53:16 +0000 (02:53 +0000)
committerRui Hirokawa <hirokawa@php.net>
Fri, 23 Nov 2001 02:53:16 +0000 (02:53 +0000)
ext/zlib/zlib.c

index bd7d6e5168dc35e689dcecae7b8b98ef51d8eed5..54f512889415fdf800dd90849188eaeb9fa51911 100644 (file)
@@ -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;
        }