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

On Fri, 23 Nov 2001, Rui Hirokawa wrote: > hirokawa Thu Nov 22 21:37:27 2001 EDT > > Modified files: (Branch: PHP_4_0_7) > /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. Why did you merge this to the release branch without having a discussion on php-dev first? This branch has just had his final RC, and the change will not be in PHP 4.1.0. (But will be in bug fix releases from the 4.1 branch). Derick PHP QA > > Index: php4/ext/zlib/zlib.c > diff -u php4/ext/zlib/zlib.c:1.94.2.3 php4/ext/zlib/zlib.c:1.94.2.4 > --- php4/ext/zlib/zlib.c:1.94.2.3 Mon Nov 12 18:16:00 2001 > +++ php4/ext/zlib/zlib.c Thu Nov 22 21:37:27 2001 > @@ -18,7 +18,7 @@ > | Jade Nicoletti <nicoletti@nns.ch> | > +----------------------------------------------------------------------+ > */ > -/* $Id: zlib.c,v 1.94.2.3 2001/11/12 23:16:00 sniper Exp $ */ > +/* $Id: zlib.c,v 1.94.2.4 2001/11/23 02:37:27 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; > } > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > For additional commands, e-mail: php-cvs-help@lists.php.net > To contact the list administrators, e-mail: php-list-admin@lists.php.net > --------------------------------------------------------------------- PHP: Scripting the Web - www.php.net - derick@php.net SRM: Site Resource Manager - www.vl-srm.net ---------------------------------------------------------------------