- Fixed a bug where stream_get_meta_data() did not return the "uri" element for

  files opened with tmpname().

diff --git a/NEWS b/NEWS
index 239f0e9ab1fd9e1c15b14d7b94a7242737507367..68f740f35c9702f3c2e81b3791e8fb7c664b3809 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 6.0
 - Unicode support. (Andrei, Dmitriy, et al)
-- Changed "instanceof" operator, is_a() and is_subcalls_of() functions to not
+- Changed "instanceof" operator, is_a() and is_subclass_of() functions to not
   call __autoload(). (Dmitry)
 - cURL improvements: (Ilia)
   . Added curl_setopt_array() which allows setting of multiple cURL options.
@@ -11,3 +11,5 @@ PHP                                                                        NEWS
   components. (Ilia)
 - Added an optional parameter to strstr() and stristr() for retrieval of either
   the part of haystack before or after first occurence of needle. (Johannes)
+- Fixed a bug where stream_get_meta_data() did not return the "uri" element for
+  files opened with tmpname(). (Derick)

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 087a434f2b39d4249df1848d84f7cb62965291cf..6acb5edc86bcea96525050824281567157f8d386 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -156,6 +156,7 @@ PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC TSRMLS_DC)
                if (stream) {
                        php_stdio_stream_data *self = (php_stdio_stream_data*)stream->abstract;
                        stream->wrapper = &php_plain_files_wrapper;
+                       stream->orig_path = estrdup(opened_path);
 
                        self->temp_file_name = opened_path;
                        self->lock_flag = LOCK_UN;