Hi Sara,

Seems you broke something:

ext/zlib/tests/zlib_filter_deflate.phpt
ext/zlib/tests/zlib_filter_inflate.phpt

Thanks. Dmitry.



> -----Original Message-----
> From: Sara Golemon [mailto:[EMAIL PROTECTED] 
> Sent: Wednesday, November 23, 2005 1:06 AM
> To: [email protected]
> Subject: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/zlib zlib_filter.c 
> 
> 
> pollita               Tue Nov 22 17:05:40 2005 EDT
> 
>   Modified files:              (Branch: PHP_5_1)
>     /php-src/ext/zlib zlib_filter.c 
>   Log:
>   Widen allowable range of values for 'window' bits.
>   Make -MAX_WBITS default (to match gzinflate() and gzdeflate())
>   
>   
> http://cvs.php.net/diff.php/php-src/ext/zlib/zlib_filter.c?r1=
> 1.6&r2=1.6.2.1&ty=u
> Index: php-src/ext/zlib/zlib_filter.c
> diff -u php-src/ext/zlib/zlib_filter.c:1.6 
> php-src/ext/zlib/zlib_filter.c:1.6.2.1
> --- php-src/ext/zlib/zlib_filter.c:1.6        Wed Aug  3 10:08:25 2005
> +++ php-src/ext/zlib/zlib_filter.c    Tue Nov 22 17:05:38 2005
> @@ -16,7 +16,7 @@
>     
> +-------------------------------------------------------------
> ---------+
>  */
>  
> -/* $Id: zlib_filter.c,v 1.6 2005/08/03 14:08:25 sniper Exp $ */
> +/* $Id: zlib_filter.c,v 1.6.2.1 2005/11/22 22:05:38 pollita Exp $ */
>  
>  #include "php.h"
>  #include "php_zlib.h"
> @@ -303,7 +303,7 @@
>       data->strm.data_type = Z_ASCII;
>  
>       if (strcasecmp(filtername, "zlib.inflate") == 0) {
> -             int windowBits = MAX_WBITS;
> +             int windowBits = -MAX_WBITS;
>  
>               if (filterparams) {
>                       zval **tmpzval;
> @@ -313,7 +313,7 @@
>                               /* log-2 base of history window 
> (9 - 15) */
>                               SEPARATE_ZVAL(tmpzval);
>                               convert_to_long_ex(tmpzval);
> -                             if (Z_LVAL_PP(tmpzval) < 9 || 
> Z_LVAL_PP(tmpzval) > MAX_WBITS) {
> +                             if (Z_LVAL_PP(tmpzval) < 
> -MAX_WBITS || Z_LVAL_PP(tmpzval) > 
> +MAX_WBITS) {
>                                       php_error_docref(NULL 
> TSRMLS_CC, E_WARNING, "Invalid parameter give for window 
> size. (%ld)", Z_LVAL_PP(tmpzval));
>                               } else {
>                                       windowBits = Z_LVAL_PP(tmpzval);
> @@ -328,7 +328,7 @@
>       } else if (strcasecmp(filtername, "zlib.deflate") == 0) {
>               /* RFC 1951 Deflate */
>               int level = Z_DEFAULT_COMPRESSION;
> -             int windowBits = MAX_WBITS;
> +             int windowBits = -MAX_WBITS;
>               int memLevel = MAX_MEM_LEVEL;
>  
>  
> @@ -357,7 +357,7 @@
>                                               /* log-2 base 
> of history window (9 - 15) */
>                                               SEPARATE_ZVAL(tmpzval);
>                                               
> convert_to_long_ex(tmpzval);
> -                                             if 
> (Z_LVAL_PP(tmpzval) < 9 || Z_LVAL_PP(tmpzval) > MAX_WBITS) {
> +                                             if 
> (Z_LVAL_PP(tmpzval) < -MAX_WBITS || Z_LVAL_PP(tmpzval) > 
> +MAX_WBITS) {
>                                                       
> php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid 
> parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval));
>                                               } else {
>                                                       
> windowBits = Z_LVAL_PP(tmpzval);
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
> 
> 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to