helly Wed Dec 14 00:06:10 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main/streams memory.c
Log:
- Fix temp/memory stream modes
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.8.2.2&r2=1.8.2.3&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.2
php-src/main/streams/memory.c:1.8.2.3
--- php-src/main/streams/memory.c:1.8.2.2 Fri Oct 7 07:38:59 2005
+++ php-src/main/streams/memory.c Wed Dec 14 00:06:09 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: memory.c,v 1.8.2.2 2005/10/07 07:38:59 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.3 2005/12/14 00:06:09 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -221,7 +221,7 @@
self->smax = -1;
self->mode = mode;
- stream = php_stream_alloc(&php_stream_memory_ops, self, 0, "r+b");
+ stream = php_stream_alloc(&php_stream_memory_ops, self, 0, mode &
TEMP_STREAM_READONLY ? "r+b" : "w+b");
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
return stream;
}
@@ -441,7 +441,7 @@
self = ecalloc(1, sizeof(*self));
self->smax = max_memory_usage;
self->mode = mode;
- stream = php_stream_alloc(&php_stream_temp_ops, self, 0, "r+b");
+ stream = php_stream_alloc(&php_stream_temp_ops, self, 0, mode &
TEMP_STREAM_READONLY ? "r+b" : "w+b");
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
self->innerstream = php_stream_memory_create(mode);
@@ -456,7 +456,7 @@
php_stream *stream;
php_stream_temp_data *ms;
- if ((stream = php_stream_temp_create_rel(mode & ~TEMP_STREAM_READONLY,
max_memory_usage)) != NULL) {
+ if ((stream = php_stream_temp_create_rel(mode, max_memory_usage)) !=
NULL) {
if (length) {
assert(buf != NULL);
php_stream_temp_write(stream, buf, length TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
