- MFH Add PHPAPI to stuff needed by streams API for shared exts

- MFH Readonly issue fix to memory streams option handling (still not
  activated in 5.2.1 though)

diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h
index 2df8d9bd1471a130ddf963bacd8be27221ae829a..e4eeaf4de50384c0120dbe6b7cfd0602066d58e0 100644 (file)
--- a/main/php_memory_streams.h
+++ b/main/php_memory_streams.h
@@ -48,10 +48,10 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR
 PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC TSRMLS_DC);
 END_EXTERN_C()
 
-extern php_stream_ops php_stream_memory_ops;
-extern php_stream_ops php_stream_temp_ops;
-extern php_stream_ops php_stream_rfc2397_ops;
-extern php_stream_wrapper php_stream_rfc2397_wrapper;
+extern PHPAPI php_stream_ops php_stream_memory_ops;
+extern PHPAPI php_stream_ops php_stream_temp_ops;
+extern PHPAPI php_stream_ops php_stream_rfc2397_ops;
+extern PHPAPI php_stream_wrapper php_stream_rfc2397_wrapper;
 
 #define PHP_STREAM_IS_MEMORY &php_stream_memory_ops
 #define PHP_STREAM_IS_TEMP   &php_stream_temp_ops

diff --git a/main/streams/memory.c b/main/streams/memory.c
index 2b690895ecaf1334bfb9801cd44042fdfef9c6af..9e906b355d2e6a67e45c68cb3b757304b378eff0 100644 (file)
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -253,6 +253,9 @@ static int php_stream_memory_set_option(php_stream *stream, int option, int valu
                                        return PHP_STREAM_OPTION_RETURN_OK;
 
                                case PHP_STREAM_TRUNCATE_SET_SIZE:
+                                       if (ms->mode & TEMP_STREAM_READONLY) {
+                                               return PHP_STREAM_OPTION_RETURN_ERR;
+                                       }
                                        newsize = *(size_t*)ptrparam;
                                        if (newsize <= ms->fsize) {
                                                if (newsize < ms->fpos) {
@@ -272,7 +275,7 @@ static int php_stream_memory_set_option(php_stream *stream, int option, int valu
 }
 /* }}} */
        
-php_stream_ops php_stream_memory_ops = {
+PHPAPI php_stream_ops  php_stream_memory_ops = {
        php_stream_memory_write, php_stream_memory_read,
        php_stream_memory_close, php_stream_memory_flush,
        "MEMORY",
@@ -532,7 +535,7 @@ static int php_stream_temp_set_option(php_stream *stream, int option, int value,
 }
 /* }}} */
 
-php_stream_ops php_stream_temp_ops = {
+PHPAPI php_stream_ops  php_stream_temp_ops = {
        php_stream_temp_write, php_stream_temp_read,
        php_stream_temp_close, php_stream_temp_flush,
        "TEMP",
@@ -585,7 +588,7 @@ PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char
 }
 /* }}} */
 
-php_stream_ops php_stream_rfc2397_ops = {
+PHPAPI php_stream_ops php_stream_rfc2397_ops = {
        php_stream_temp_write, php_stream_temp_read,
        php_stream_temp_close, php_stream_temp_flush,
        "RFC2397",