[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard php_fopen_wrapper.c

[Marcus Boerger]

helly           Mon May  1 16:02:07 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/standard       php_fopen_wrapper.c 
  Log:
  - Make SplTempFileObject work in 5.1
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.3&r2=1.45.2.4&diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.3 
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.3   Sun Jan  1 12:50:15 2006
+++ php-src/ext/standard/php_fopen_wrapper.c    Mon May  1 16:02:07 2006
@@ -17,7 +17,7 @@
    |          Hartmut Holzgraefe <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_fopen_wrapper.c,v 1.45.2.3 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4 2006/05/01 16:02:07 helly Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -158,9 +158,29 @@
        int mode_rw = 0;
        php_stream * stream = NULL;
        char *p, *token, *pathdup;
+       long max_memory;
 
-       if (!strncasecmp(path, "php://", 6))
+       if (!strncasecmp(path, "php://", 6)) {
                path += 6;
+       }
+       
+       if (!strncasecmp(path, "temp", 4)) {
+               path += 4;
+               max_memory = PHP_STREAM_MAX_MEM;
+               if (!strncasecmp(path, "/maxmemory:", 11)) {
+                       path += 11;
+                       max_memory = strtol(path, NULL, 10);
+                       if (max_memory < 0) {
+                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Max 
memory must be >= 0");
+                               return NULL;
+                       }
+               }
+               return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory); 
        
+       }
+       
+       if (!strcasecmp(path, "memory")) {
+               return php_stream_memory_create(TEMP_STREAM_DEFAULT);
+       }
        
        if (!strcasecmp(path, "output")) {
                return php_stream_alloc(&php_stream_output_ops, NULL, 0, "wb");

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