tony2001 Mon May 23 11:37:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/main/streams streams.c
Log:
revert by Wez's request
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.397&r2=1.1760.2.398&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.397 php-src/NEWS:1.1760.2.398
--- php-src/NEWS:1.1760.2.397 Mon May 23 07:52:23 2005
+++ php-src/NEWS Mon May 23 11:37:10 2005
@@ -35,7 +35,6 @@
- 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)
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61.2.12&r2=1.61.2.13&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61.2.12
php-src/main/streams/streams.c:1.61.2.13
--- php-src/main/streams/streams.c:1.61.2.12 Mon May 23 07:52:12 2005
+++ php-src/main/streams/streams.c Mon May 23 11:37:10 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.61.2.12 2005/05/23 11:52:12 tony2001 Exp $ */
+/* $Id: streams.c,v 1.61.2.13 2005/05/23 15:37:10 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -592,7 +592,7 @@
}
/* 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;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
