From: Greg Beaver <cellog@php.net>
Date: Sun, 13 Apr 2008 22:19:10 +0000 (+0000)
Subject: do not scan include_path with faulty plain_wrapper-based include_path fopen
X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e668dc629b1973dc3db996a14d67a56cbbb44ba6;p=php

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)
---

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index e35ffcb168..ace2dc38fd 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -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;
 	}