helly Sun May 14 00:45:27 2006 UTC
Modified files:
/php-src/ext/standard/tests/file stream_rfc2397_001.phpt
stream_rfc2397_002.phpt
/php-src/main/streams memory.c
Log:
- Change to use dedicated stream ops
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/stream_rfc2397_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/stream_rfc2397_001.phpt
diff -u php-src/ext/standard/tests/file/stream_rfc2397_001.phpt:1.1
php-src/ext/standard/tests/file/stream_rfc2397_001.phpt:1.2
--- php-src/ext/standard/tests/file/stream_rfc2397_001.phpt:1.1 Sat May 13
17:53:01 2006
+++ php-src/ext/standard/tests/file/stream_rfc2397_001.phpt Sun May 14
00:45:27 2006
@@ -1,5 +1,5 @@
--TEST--
-Stream: RFC2397
+Stream: RFC2397 getting the data
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/stream_rfc2397_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/stream_rfc2397_002.phpt
diff -u php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.1
php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2
--- php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.1 Sun May 14
00:40:53 2006
+++ php-src/ext/standard/tests/file/stream_rfc2397_002.phpt Sun May 14
00:45:27 2006
@@ -35,7 +35,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
@@ -58,7 +58,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
@@ -89,7 +89,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
@@ -114,7 +114,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
@@ -141,7 +141,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
@@ -168,7 +168,7 @@
["wrapper_type"]=>
string(7) "RFC2397"
["stream_type"]=>
- string(4) "TEMP"
+ string(7) "RFC2397"
["mode"]=>
string(1) "r"
["unread_bytes"]=>
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.16&r2=1.17&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.16 php-src/main/streams/memory.c:1.17
--- php-src/main/streams/memory.c:1.16 Sun May 14 00:40:53 2006
+++ php-src/main/streams/memory.c Sun May 14 00:45:27 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: memory.c,v 1.16 2006/05/14 00:40:53 helly Exp $ */
+/* $Id: memory.c,v 1.17 2006/05/14 00:45:27 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -656,6 +656,7 @@
/* 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
