cellog Wed Jan 9 08:12:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zlib zlib_filter.c
Log:
apply proper fix of bug #43793 to zlib.deflate (window+16 = gzip)
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.4.2.3&r2=1.6.2.2.2.4.2.4&diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.3
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.4
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.3 Wed Jan 9 07:03:28 2008
+++ php-src/ext/zlib/zlib_filter.c Wed Jan 9 08:12:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.3 2008/01/09 07:03:28 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.4 2008/01/09 08:12:33 cellog Exp $ */
#include "php.h"
#include "php_zlib.h"
@@ -367,7 +367,7 @@
/* log-2 base of history window
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) <
-MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 32) {
+ if (Z_LVAL_PP(tmpzval) <
-MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 16) {
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
