This seems to resolve the issues with fgets.

I've moved EOF detection into the streams layer; a stream reader
implementation should set stream->eof when it detects EOF.
Fixed test for user streams - it still fails but that is due to an output
buffering bug.

1 files changed, 6 insertions, 6 deletions

diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c
index 1ccccc615a..b97f6a691b 100644
--- a/ext/zlib/zlib_fopen_wrapper.c
+++ b/ext/zlib/zlib_fopen_wrapper.c
@@ -32,14 +32,14 @@ struct php_gz_stream_data_t	{
 static size_t php_gziop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
 {
 	struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract;
+	size_t ret;
+	
+	ret = gzread(self->gz_file, buf, count);
 
-	if (buf == NULL && count == 0) {
-		if (gzeof(self->gz_file))
-			return EOF;
-		return 0;
-	}
+	if (ret == 0 && gzeof(self->gz_file))
+		stream->eof = 1;
 	
-	return gzread(self->gz_file, buf, count); 
+	return ret;
 }
 
 static size_t php_gziop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)