From: Greg Beaver <cellog@php.net>
Date: Sat, 12 Jan 2008 22:28:04 +0000 (+0000)
Subject: wrong file version merged in fix for Bug #40189, here is the correct fix
X-Git-Tag: RELEASE_2_0_0a1~928
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51603d0a4836a80222bc0e9fad4aaa84b51161c3;p=php

wrong file version merged in fix for Bug #40189, here is the correct fix
---

diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c
index 03f8bfc282..e8936d4f09 100644
--- a/ext/zlib/zlib_filter.c
+++ b/ext/zlib/zlib_filter.c
@@ -106,7 +106,7 @@ static php_stream_filter_status_t php_zlib_inflate_filter(
 			data->strm.avail_in = 0;
 			bin += desired;
 
-			if (status == Z_STREAM_END || data->strm.avail_out < data->outbuf_len) {
+			if (data->strm.avail_out < data->outbuf_len) {
 				php_stream_bucket *out_bucket;
 				size_t bucketlen = data->outbuf_len - data->strm.avail_out;
 				out_bucket = php_stream_bucket_new(stream, estrndup(data->outbuf, bucketlen), bucketlen, 1, 0 TSRMLS_CC);
@@ -114,12 +114,12 @@ static php_stream_filter_status_t php_zlib_inflate_filter(
 				data->strm.avail_out = data->outbuf_len;
 				data->strm.next_out = data->outbuf;
 				exit_status = PSFS_PASS_ON;
-				if (status == Z_STREAM_END && data->strm.avail_out >= data->outbuf_len) {
-					/* no more data to decompress, and nothing was spat out */
-					php_stream_bucket_delref(bucket TSRMLS_CC);
-					return PSFS_PASS_ON;
-				}
+			} else if (status == Z_STREAM_END && data->strm.avail_out >= data->outbuf_len) {
+				/* no more data to decompress, and nothing was spat out */
+				php_stream_bucket_delref(bucket TSRMLS_CC);
+				return PSFS_PASS_ON;
 			}
+
 		}
 		consumed += bucket->buflen;
 		php_stream_bucket_delref(bucket TSRMLS_CC);