]> granicus.if.org Git - php/commitdiff
If a wrapper could not be found it is either a typo or a configuration issue. But...
authorLars Strojny <lstrojny@php.net>
Sun, 14 Dec 2008 16:25:37 +0000 (16:25 +0000)
committerLars Strojny <lstrojny@php.net>
Sun, 14 Dec 2008 16:25:37 +0000 (16:25 +0000)
ext/standard/tests/file/stream_001.phpt
main/streams/streams.c

index 67a4a6abd3d99216d6bbf388da075521357b90d3..eece30a2f5179fdc64a63a4ea318494b3d6171b3 100644 (file)
@@ -13,7 +13,7 @@ echo "Done\n";
 --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
 
index 704e2ccd20b59db9d3c6acd1aeee2b2188e1c1f8..dd095bba28b1074cf76fd13eafb4981f93c4a9ef 100755 (executable)
@@ -1548,8 +1548,8 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, char
                                        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 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, char
                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;