[PHP-CVS] cvs: php4 /ext/standard php_fopen_wrapper.c

[Sara Golemon]

pollita         Thu Feb 20 15:05:31 2003 EDT

  Modified files:              
    /php4/ext/standard  php_fopen_wrapper.c 
  Log:
  Reduce unnecessary filter applications when stream is (read|write) only
  
  
Index: php4/ext/standard/php_fopen_wrapper.c
diff -u php4/ext/standard/php_fopen_wrapper.c:1.33 
php4/ext/standard/php_fopen_wrapper.c:1.34
--- php4/ext/standard/php_fopen_wrapper.c:1.33  Tue Feb 18 01:10:14 2003
+++ php4/ext/standard/php_fopen_wrapper.c       Thu Feb 20 15:05:31 2003
@@ -17,7 +17,7 @@
    |          Hartmut Holzgraefe <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_fopen_wrapper.c,v 1.33 2003/02/18 06:10:14 pollita Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.34 2003/02/20 20:05:31 pollita Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -150,6 +150,7 @@
 php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, char 
*mode, int options, char **opened_path, php_stream_context *context STREAMS_DC 
TSRMLS_DC)
 {
        int fd = -1;
+       int mode_rw = 0;
        php_stream * stream = NULL;
        char *p, *token, *pathdup;
 
@@ -179,6 +180,13 @@
        }
 
        if (!strncasecmp(path, "filter/", 7)) {
+               /* Save time/memory when chain isn't specified */
+               if (strchr(mode, 'r') || strchr(mode, '+')) {
+                       mode_rw |= PHP_STREAM_FILTER_READ;
+               }
+               if (strchr(mode, 'w') || strchr(mode, '+') || strchr(mode, 'a')) {
+                       mode_rw |= PHP_STREAM_FILTER_WRITE;
+               }
                pathdup = estrndup(path + 6, strlen(path + 6));
                p = strstr(pathdup, "/resource=");
                if (!p) {
@@ -200,7 +208,7 @@
                        } else if (!strncasecmp(p, "write=", 6)) {
                                php_stream_apply_filter_list(stream, p + 6, 0, 1 
TSRMLS_CC);
                        } else {
-                               php_stream_apply_filter_list(stream, p, 1, 1 
TSRMLS_CC);
+                               php_stream_apply_filter_list(stream, p, mode_rw & 
+PHP_STREAM_FILTER_READ, mode_rw & PHP_STREAM_FILTER_WRITE TSRMLS_CC);
                        }
                        p = php_strtok_r(NULL, "/", &token);
                }



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