summaryrefslogtreecommitdiff
path: root/main/streams
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2008-04-13 22:19:10 +0000
committerGreg Beaver <cellog@php.net>2008-04-13 22:19:10 +0000
commite668dc629b1973dc3db996a14d67a56cbbb44ba6 (patch)
treed36f37dc83c133c5e0afd2b3896bd28f02a52ec0 /main/streams
parent217b911d0e17c831abb6cb47551bc97ee168033a (diff)
downloadphp-git-e668dc629b1973dc3db996a14d67a56cbbb44ba6.tar.gz
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)
Diffstat (limited to 'main/streams')
-rw-r--r--main/streams/plain_wrapper.c4
1 files changed, 0 insertions, 4 deletions
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;
}