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

revert by Wez's request
---

diff --git a/NEWS b/NEWS
index 852105aaee..03573e09be 100644
--- a/NEWS
+++ b/NEWS
@@ -35,7 +35,6 @@ PHP                                                                        NEWS
 - Fixed bug #32852 (Crash with singleton and __destruct when
   zend.ze1_compatibility_mode = On). (Dmitry)
 - 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 #32809 (Missing T1LIB support on Windows). (Edin)
 - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
 - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 432cd9fa1f..2149d6394c 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -592,7 +592,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;
 		}
 	}