add an open mode for the memory streams that allows the stream to take

ownership of the passed-in buffer

diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h
index 4af7745efe3226428a03816f0b3264ccd82a3b24..1a9b9000d793702c36083d7871f56198a33df82f 100644 (file)
--- a/main/php_memory_streams.h
+++ b/main/php_memory_streams.h
@@ -27,6 +27,7 @@
 
 #define TEMP_STREAM_DEFAULT  0
 #define TEMP_STREAM_READONLY 1
+#define TEMP_STREAM_TAKE_BUFFER 2
 
 #define php_stream_memory_create(mode) _php_stream_memory_create((mode) STREAMS_CC TSRMLS_CC)
 #define php_stream_memory_create_rel(mode) _php_stream_memory_create((mode) STREAMS_REL_CC TSRMLS_CC)

diff --git a/main/streams/memory.c b/main/streams/memory.c
index a61bd6619ef8dbe81834cd236d314a059b8ef066..a9b3f01cb85db952b82341440c259b19ca702734 100644 (file)
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -237,7 +237,7 @@ PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length ST
        if ((stream = php_stream_memory_create_rel(mode)) != NULL) {
                ms = stream->abstract;
                
-               if (mode == TEMP_STREAM_READONLY) {
+               if (mode == TEMP_STREAM_READONLY || mode == TEMP_STREAM_TAKE_BUFFER) {
                        /* use the buffer directly */
                        ms->data = buf;
                        ms->fsize = length;