cellog          Sun Apr 13 22:19:10 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main/streams       plain_wrapper.c 
  Log:
  do not scan include_path with faulty plain_wrapper-based include_path fopen
  
  # _fopen_with_path_rel probably needs to call out to regular php_stream_open, 
for exts that use it (it is exported)
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.23.2.6&r2=1.52.2.6.2.23.2.7&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.6 
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.7
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.6      Thu Mar 27 
10:33:40 2008
+++ php-src/main/streams/plain_wrapper.c        Sun Apr 13 22:19:10 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.6 2008/03/27 10:33:40 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.7 2008/04/13 22:19:10 cellog Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -979,10 +979,6 @@
 static php_stream *php_plain_files_stream_opener(php_stream_wrapper *wrapper, 
char *path, char *mode,
                int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC)
 {
-       if ((options & USE_PATH) && PG(include_path) != NULL) {
-               return php_stream_fopen_with_path_rel(path, mode, 
PG(include_path), opened_path, options);
-       }
-
        if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && 
php_check_open_basedir(path TSRMLS_CC)) {
                return NULL;
        }



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

Reply via email to