]> granicus.if.org Git - php/commitdiff
do not scan include_path with faulty plain_wrapper-based include_path fopen
authorGreg Beaver <cellog@php.net>
Sun, 13 Apr 2008 22:19:10 +0000 (22:19 +0000)
committerGreg Beaver <cellog@php.net>
Sun, 13 Apr 2008 22:19:10 +0000 (22:19 +0000)
# _fopen_with_path_rel probably needs to call out to regular php_stream_open, for exts that use it (it is exported)

main/streams/plain_wrapper.c

index e35ffcb16836eb7c3126b68e7c39891a6ffb4339..ace2dc38fd6d40c75481e6803ccd56d597f424d8 100644 (file)
@@ -979,10 +979,6 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, cha
 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;
        }