revert by Wez's request

diff --git a/NEWS b/NEWS
index 852105aaee5a864215c581c85b36a7a2d8b0c757..03573e09bee4249765f47c40d6a6e813467a6222 100644 (file)
--- 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 432cd9fa1f56fef5d6400a6b81a9d1ec6e7c3349..2149d6394c984316b0f59d9436129dbb7e292299 100755 (executable)
--- 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;
                }
        }