helly           Sat Feb  3 14:45:54 2007 UTC

  Modified files:              
    /php-src/main       php_memory_streams.h 
    /php-src/main/streams       memory.c 
  Log:
  - Fix mem/temp stream exports and readonlyissue
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_memory_streams.h?r1=1.16&r2=1.17&diff_format=u
Index: php-src/main/php_memory_streams.h
diff -u php-src/main/php_memory_streams.h:1.16 
php-src/main/php_memory_streams.h:1.17
--- php-src/main/php_memory_streams.h:1.16      Mon Jan  1 09:29:35 2007
+++ php-src/main/php_memory_streams.h   Sat Feb  3 14:45:54 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_memory_streams.h,v 1.16 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php_memory_streams.h,v 1.17 2007/02/03 14:45:54 helly Exp $ */
 
 #ifndef PHP_MEMORY_STREAM_H
 #define PHP_MEMORY_STREAM_H
@@ -48,10 +48,10 @@
 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
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.32&r2=1.33&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.32 php-src/main/streams/memory.c:1.33
--- php-src/main/streams/memory.c:1.32  Sat Jan 27 15:17:23 2007
+++ php-src/main/streams/memory.c       Sat Feb  3 14:45:54 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: memory.c,v 1.32 2007/01/27 15:17:23 helly Exp $ */
+/* $Id: memory.c,v 1.33 2007/02/03 14:45:54 helly Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -253,6 +253,9 @@
                                        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 @@
 }
 /* }}} */
        
-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 @@
 }
 /* }}} */
 
-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 @@
 }
 /* }}} */
 
-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",
@@ -726,7 +729,7 @@
        return stream;
 }
 
-static php_stream_wrapper_ops php_stream_rfc2397_wops = {
+PHPAPI php_stream_wrapper_ops php_stream_rfc2397_wops = {
        php_stream_url_wrap_rfc2397,
        NULL, /* close */
        NULL, /* fstat */
@@ -739,7 +742,7 @@
        NULL  /* rmdir */
 };
 
-php_stream_wrapper php_stream_rfc2397_wrapper =        {
+PHPAPI php_stream_wrapper php_stream_rfc2397_wrapper = {
        &php_stream_rfc2397_wops,
        NULL,
        1, /* is_url */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to