- Fixed bug #43510 (stream_get_meta_data() does not return same mode as used in fopen)

diff --git a/NEWS b/NEWS
index 877c8680482d7018aab5033f18cefb5f4b354597..d5c0869daba7decffce9aa23216c9e7733708971 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,8 @@ PHP                                                                        NEWS
 - Fixed bug #45141 (setcookie will output expires years of >4 digits). (Ilia)
 - Fixed bug #44144 (spl_autoload_functions() should return object instance
   when appropriate). (Hannes, Etienne)
+- Fixed bug #43510 (stream_get_meta_data() does not return same mode as used
+  in fopen). (Jani)
 - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot 
   com, Kalle)
 

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 64981682b0c56f2a305c7eb3d7fe072dd0338427..6a39982d3f1f386a0a277a079d3ce07be14ebea1 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -325,7 +325,6 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                strlcat(scratch, " HTTP/1.0\r\n", scratch_len);
        }
 
-
        /* send it */
        php_stream_write(stream, scratch, strlen(scratch));
 
@@ -756,6 +755,8 @@ out:
                 * the stream */
                stream->position = 0;
 
+               /* restore mode */
+               strlcpy(stream->mode, mode, sizeof(stream->mode));
        }
 
        return stream;

diff --git a/ext/standard/tests/http/bug43510.phpt b/ext/standard/tests/http/bug43510.phpt
new file mode 100644 (file)
index 0000000..710b086
--- /dev/null
+++ b/ext/standard/tests/http/bug43510.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #43510: stream_get_meta_data() does not return same mode as used in fopen
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--FILE--
+<?php
+require 'server.inc';
+
+$responses = array(
+       "data://text/plain,HTTP/1.0 200 OK\r\n\r\n",
+       "data://text/plain,HTTP/1.0 200 OK\r\n\r\n",
+);
+
+$pid = http_server("tcp://127.0.0.1:12342", $responses, $output);
+
+foreach(array('r', 'rb') as $mode) {
+       $fd = fopen('http://127.0.0.1:12342/', $mode, false);
+       $meta = stream_get_meta_data($fd);
+       var_dump($meta['mode']);
+       fclose($fd);
+}
+
+http_server_kill($pid);
+
+?>
+--EXPECT--
+string(1) "r"
+string(2) "rb"