lstrojny Sun Dec 14 16:25:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main/streams streams.c /php-src/ext/standard/tests/file stream_001.phpt Log: If a wrapper could not be found it is either a typo or a configuration issue. But in both cases it is critical enough to warn the user. http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.20&r2=1.82.2.6.2.18.2.21&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.20 php-src/main/streams/streams.c:1.82.2.6.2.18.2.21 --- php-src/main/streams/streams.c:1.82.2.6.2.18.2.20 Mon Nov 24 15:36:47 2008 +++ php-src/main/streams/streams.c Sun Dec 14 16:25:37 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.82.2.6.2.18.2.20 2008/11/24 15:36:47 dsp Exp $ */ +/* $Id: streams.c,v 1.82.2.6.2.18.2.21 2008/12/14 16:25:37 lstrojny Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -1548,8 +1548,8 @@ n = sizeof(wrapper_name) - 1; } PHP_STRLCPY(wrapper_name, protocol, sizeof(wrapper_name), n); - - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unable to find the wrapper \"%s\" - did you forget to enable it when you configured PHP?", wrapper_name); + + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find the wrapper \"%s\" - did you forget to enable it when you configured PHP?", wrapper_name); wrapperpp = NULL; protocol = NULL; @@ -1597,15 +1597,15 @@ if (options & STREAM_LOCATE_WRAPPERS_ONLY) { return NULL; } - + if (FG(stream_wrappers)) { - /* The file:// wrapper may have been disabled/overridden */ + /* The file:// wrapper may have been disabled/overridden */ if (wrapperpp) { /* It was found so go ahead and provide it */ return *wrapperpp; } - + /* Check again, the original check might have not known the protocol name */ if (zend_hash_find(wrapper_hash, "file", sizeof("file"), (void**)&wrapperpp) == SUCCESS) { return *wrapperpp; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_001.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/stream_001.phpt diff -u php-src/ext/standard/tests/file/stream_001.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/file/stream_001.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/file/stream_001.phpt:1.1.2.3.2.1 Tue Nov 6 11:02:36 2007 +++ php-src/ext/standard/tests/file/stream_001.phpt Sun Dec 14 16:25:37 2008 @@ -13,7 +13,7 @@ --EXPECTF-- bool(true) -Notice: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d +Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d Warning: fopen(): file:// wrapper is disabled in the server configuration in %s on line %d
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php