tony2001 Mon May 23 07:52:45 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/main streams.c
Log:
MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.911&r2=1.1247.2.912&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.911 php-src/NEWS:1.1247.2.912
--- php-src/NEWS:1.1247.2.911 Mon May 23 05:43:59 2005
+++ php-src/NEWS Mon May 23 07:52:42 2005
@@ -23,6 +23,7 @@
- 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)
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.96&r2=1.125.2.97&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.96 php-src/main/streams.c:1.125.2.97
--- php-src/main/streams.c:1.125.2.96 Mon May 16 04:55:31 2005
+++ php-src/main/streams.c Mon May 23 07:52:44 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.96 2005/05/16 08:55:31 tony2001 Exp $ */
+/* $Id: streams.c,v 1.125.2.97 2005/05/23 11:52:44 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -654,8 +654,9 @@
}
/* just break anyway, to avoid greedy read */
- if (stream->wrapper != &php_plain_files_wrapper)
+ if (stream->wrapper != NULL && stream->wrapper !=
&php_plain_files_wrapper) {
break;
+ }
}
if (didread > 0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
