- Change to use dedicated stream ops

diff --git a/ext/standard/tests/file/stream_rfc2397_001.phpt b/ext/standard/tests/file/stream_rfc2397_001.phpt
index 23a573092362541cdc35fd9cbc318e00d5cde746..774bb089bc0063b75bb37f1369423f7f92e29370 100755 (executable)
--- a/ext/standard/tests/file/stream_rfc2397_001.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Stream: RFC2397
+Stream: RFC2397 getting the data
 --FILE--
 <?php
 

diff --git a/ext/standard/tests/file/stream_rfc2397_002.phpt b/ext/standard/tests/file/stream_rfc2397_002.phpt
index 9980968747dad6fa2f82bdae8ce219ffdca4a632..1e63ea37e86a2286a4f941530defccf35b556812 100755 (executable)
--- a/ext/standard/tests/file/stream_rfc2397_002.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_002.phpt
@@ -35,7 +35,7 @@ array(8) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>
@@ -58,7 +58,7 @@ array(8) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>
@@ -89,7 +89,7 @@ array(9) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>
@@ -114,7 +114,7 @@ array(10) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>
@@ -141,7 +141,7 @@ array(10) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>
@@ -168,7 +168,7 @@ array(11) {
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
-  string(4) "TEMP"
+  string(7) "RFC2397"
   ["mode"]=>
   string(1) "r"
   ["unread_bytes"]=>

diff --git a/main/streams/memory.c b/main/streams/memory.c
index 426635fad3190c2f347892cc283306659cb68629..5ba9902ebbc2e1c754944164a95edfda217af06a 100644 (file)
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -656,6 +656,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, cha
                /* store data */
                php_stream_temp_write(stream, comma, dlen TSRMLS_CC);
                php_stream_temp_seek(stream, 0, SEEK_SET, &newoffs TSRMLS_CC);
+               stream->ops = &php_stream_rfc2397_ops;
                ts = (php_stream_temp_data*)stream->abstract;
                assert(ts != NULL);
                ts->mode = mode && mode[0] == 'r' ? TEMP_STREAM_READONLY : 0;