dmitry Fri Nov 9 09:37:42 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file bug43216.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard streamsfuncs.c
Log:
Fixed bug #43216 (stream_is_local() returns false on "file://")
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1002&r2=1.2027.2.547.2.1003&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1002 php-src/NEWS:1.2027.2.547.2.1003
--- php-src/NEWS:1.2027.2.547.2.1002 Fri Nov 9 09:28:17 2007
+++ php-src/NEWS Fri Nov 9 09:37:42 2007
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2008, PHP 5.2.6
+- Fixed bug #43216 (stream_is_local() returns false on "file://"). (Dmitry)
- Fixed bug #43201 (Crash on using unitialized vals and __get/__set). (Dmitry)
- Fixed bug #43175 (__destruct() throwing an exception with __call() causes
segfault). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.16&r2=1.58.2.6.2.17&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.16
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.17
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.16 Thu Oct 4 13:31:11 2007
+++ php-src/ext/standard/streamsfuncs.c Fri Nov 9 09:37:42 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.16 2007/10/04 13:31:11 jani Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.17 2007/11/09 09:37:42 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1361,7 +1361,7 @@
wrapper = stream->wrapper;
} else {
convert_to_string_ex(&zstream);
- wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC);
+ wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
}
if(!wrapper) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43216.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug43216.phpt
+++ php-src/ext/standard/tests/file/bug43216.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
