- MFH: 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 d4ffe047c213e89426f4e6f9524c0b14b6a81650..5236165a61c755ce9a463694a6f2ad13d3517bae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP                                                                        NEWS
   . openssl 0.9.8
   . ming 0.3b
   . libpq (PostgreSQL) 8.0.1
+- Fixed a bug where stream_get_meta_data() did not return the "uri" element for
+  files opened with tmpname(). (Derick)
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)

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;