clarify error message on why opening a stream wrapper failed for allow_url_include...

diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt
index d422a827690b1fe8a30b9759ba71897dc5d98e2d..4841d39c5186968313669d741ab593bdb66183dc 100755 (executable)
--- a/ext/standard/tests/file/include_userstream_002.phpt
+++ b/ext/standard/tests/file/include_userstream_002.phpt
@@ -97,7 +97,7 @@ include "test2://hello";
 <?php echo "Hello World\n";?>
 <?php echo "Hello World\n";?>
 
-Warning: fopen(): test1:// wrapper is disabled in the server configuration in %sinclude_userstream_002.php on line 10
+Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_include=0 in %sinclude_userstream_002.php on line 10
 
 Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 10
 

diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt
new file mode 100644 (file)
index 0000000..2b439cf
--- /dev/null
+++ b/ext/standard/tests/file/include_userstream_003.phpt
@@ -0,0 +1,121 @@
+--TEST--
+allow_url_fopen disabled
+--INI--
+allow_url_fopen=0
+allow_url_include=1
+--FILE--
+<?php
+class test {
+    private $data = '<?php echo "Hello World\n";?>';
+       private $pos;
+       private $stream = null;
+
+       function stream_open($path, $mode, $options, &$opened_path)
+       {
+               if (strpos($path, "test2://") === 0) {
+                       $this->stream = fopen("test1://".substr($path, 8), $mode);
+                       return !empty($this->stream);
+               }
+               if (strchr($mode, 'a'))
+                       $this->pos = strlen($this->data);
+               else
+                       $this->po = 0;
+               
+               return true;
+       }
+
+       function stream_read($count)
+       {
+               if (!empty($this->stream)) {
+                       return fread($this->stream, $count);
+               }
+               $ret = substr($this->data, $this->pos, $count);
+               $this->pos += strlen($ret);
+               return $ret;
+       }
+
+       function stream_tell()
+       {
+               if (!empty($this->stream)) {
+                       return ftell($this->stream);
+               }
+               return $this->pos;
+       }
+
+       function stream_eof()
+       {
+               if (!empty($this->stream)) {
+                       return feof($this->stream);
+               }
+               return $this->pos >= strlen($this->data);
+       }
+
+       function stream_seek($offset, $whence)
+       {
+               if (!empty($this->stream)) {
+                       return fseek($this->stream, $offset, $whence);
+               }
+               switch($whence) {
+                       case SEEK_SET:
+                               if ($offset < $this->data && $offset >= 0) {
+                                       $this->pos = $offset;
+                                       return true;
+                               } else {
+                                       return false;
+                               }
+                               break;
+                       case SEEK_CUR:
+                               if ($offset >= 0) {
+                                       $this->pos += $offset;
+                                       return true;
+                               } else {
+                                       return false;
+                               }
+                               break;
+                       case SEEK_END:
+                               if (strlen($this->data) + $offset >= 0) {
+                                       $this->pos = strlen($this->data) + $offset;
+                                       return true;
+                               } else {
+                                       return false;
+                               }
+                               break;
+                       default:
+                               return false;
+               }
+       }
+
+}
+
+stream_register_wrapper("test1", "test", STREAM_IS_URL);
+stream_register_wrapper("test2", "test");
+echo file_get_contents("test1://hello"),"\n";
+include "test1://hello";
+echo file_get_contents("test2://hello"),"\n";
+include "test2://hello";
+--EXPECTF--
+Warning: file_get_contents(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 86
+
+Warning: file_get_contents(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 86
+
+
+Warning: include(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 87
+
+Warning: include(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 87
+
+Warning: include(): Failed opening 'test1://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 87
+
+Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10
+
+Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10
+
+Warning: file_get_contents(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 88
+
+
+Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10
+
+Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10
+
+Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 89
+
+Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 89
\ No newline at end of file

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 96cba10fe548970e53797d09a969340b25b872cf..61a73eebdea57d2eb277b5d50f28252c5845d461 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2184,7 +2184,11 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, char
                if (options & REPORT_ERRORS) {
                        /* protocol[n] probably isn't '\0' */
                        char *protocol_dup = estrndup(protocol, n);
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration", protocol_dup);
+                       if (!PG(allow_url_fopen)) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration by allow_url_fopen=0", protocol_dup);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration by allow_url_include=0", protocol_dup);
+                       }
                        efree(protocol_dup);
                }
                return NULL;