From: Antony Dovgal <tony2001@php.net>
Date: Mon, 23 May 2005 15:37:29 +0000 (+0000)
Subject: revert by Wez's request
X-Git-Tag: php-4.4.0RC1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64ddf44bd5e16a6573a694fdeaae84c3a1e1d5d0;p=php

revert by Wez's request
---

diff --git a/NEWS b/NEWS
index 5401f8dd2f..953fdfe789 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,6 @@ PHP 4                                                                      NEWS
 - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
 - Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
 - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
-- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony)
 - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
 - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
 - Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
diff --git a/main/streams.c b/main/streams.c
index 73465b5f36..8ce94463bb 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -654,7 +654,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
 		}
 
 		/* just break anyway, to avoid greedy read */
-		if (stream->wrapper != NULL && stream->wrapper != &php_plain_files_wrapper) {
+		if (stream->wrapper != &php_plain_files_wrapper) {
 			break;
 		}
 	}