From: Derick Rethans <derick@php.net>
Date: Fri, 26 Aug 2005 12:50:06 +0000 (+0000)
Subject: - Fixed a bug where stream_get_meta_data() did not return the "uri" element for
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdcf566a21f6cb572d1d26ad6341e18564caec32;p=php

- 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 239f0e9ab1..68f740f35c 100644
--- 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 087a434f2b..6acb5edc86 100644
--- 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;