diff options
| -rw-r--r-- | ext/zlib/tests/inflate_init_error.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt index 0e0e8b33bf..58c07a426c 100644 --- a/ext/zlib/tests/inflate_init_error.phpt +++ b/ext/zlib/tests/inflate_init_error.phpt @@ -13,7 +13,7 @@ var_dump(inflate_init(42)); ?> --EXPECTF-- -Warning: inflate_init() expects exactly 1 parameter, 0 given in %s on line %d +Warning: inflate_init() expects at least 1 parameter, 0 given in %s on line %d NULL Warning: inflate_init(): encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index f3d51a4d0f..8169424362 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -865,7 +865,7 @@ PHP_FUNCTION(inflate_init) if (encoding < 0) { encoding += 15 - window; } else { - encoding &= window; + encoding -= 15 - window; } if (Z_OK == inflateInit2(ctx, encoding)) { @@ -1065,7 +1065,7 @@ PHP_FUNCTION(deflate_init) if (encoding < 0) { encoding += 15 - window; } else { - encoding &= window; + encoding -= 15 - window; } if (Z_OK == deflateInit2(ctx, level, Z_DEFLATED, encoding, memory, strategy)) { |