cvs: php-src /main/streams memory.c

From: Date: Sun, 30 Oct 2005 17:17:46 +0000
Subject: cvs: php-src /main/streams memory.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34892@lists.php.net to get a copy of this message
helly Sun Oct 30 12:17:46 2005 EDT Modified files: /php-src/main/streams memory.c Log: - Fix mode handling http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.10&r2=1.11&ty=u Index: php-src/main/streams/memory.c diff -u php-src/main/streams/memory.c:1.10 php-src/main/streams/memory.c:1.11 --- php-src/main/streams/memory.c:1.10 Fri Oct 7 03:37:37 2005 +++ php-src/main/streams/memory.c Sun Oct 30 12:17:44 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: memory.c,v 1.10 2005/10/07 07:37:37 helly Exp $ */ +/* $Id: memory.c,v 1.11 2005/10/30 17:17:44 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);

« previous php.cvs (#34892) next »