dmitry Thu Nov 8 13:29:38 2007 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
/php-src/ext/standard/tests/file bug43216.phpt
Log:
Fixed bug #43216 (stream_is_local() returns false on "file://")
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.108&r2=1.109&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.108
php-src/ext/standard/streamsfuncs.c:1.109
--- php-src/ext/standard/streamsfuncs.c:1.108 Wed Oct 10 12:51:06 2007
+++ php-src/ext/standard/streamsfuncs.c Thu Nov 8 13:29:38 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.108 2007/10/10 12:51:06 jani Exp $ */
+/* $Id: streamsfuncs.c,v 1.109 2007/11/08 13:29:38 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1666,7 +1666,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?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/bug43216.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug43216.phpt:1.2
--- /dev/null Thu Nov 8 13:29:38 2007
+++ php-src/ext/standard/tests/file/bug43216.phpt Thu Nov 8 13:29:38 2007
@@ -0,0 +1,8 @@
+--TEST--
+Bug #43216 (stream_is_local() returns false on file://)
+--FILE--
+<?
+var_dump(stream_is_local("file://"));
+?>
+--EXPECT--
+bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
