revert by Wez's request

tony2001 · tony2001 · commit 64ddf44bd5e1 · 2005-05-23T15:37:29.000Z
diff --git 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
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ PHPAPI size_t _php_stream_read(php_stream stream, char buf, size_t size TSRMLS`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`/* just break anyway, to avoid greedy read */`
`657`		`- if (stream->wrapper != NULL && stream->wrapper != &php_plain_files_wrapper) {`
	`657`	`+ if (stream->wrapper != &php_plain_files_wrapper) {`
`658`	`658`	`break;`
`659`	`659`	`}`
`660`	`660`	`}`