diff options
| author | Adam Harvey <aharvey@php.net> | 2011-02-04 10:47:41 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2011-02-04 10:47:41 +0000 |
| commit | 521e5462abb6eb7036b39f337f2be55849f6e90d (patch) | |
| tree | 0d184d9af898d3ae1f0634707ddbac023df88d3b /main | |
| parent | 34a9ff9e49a942c05b05aabbf62a97fe8ee0e830 (diff) | |
| download | php-git-521e5462abb6eb7036b39f337f2be55849f6e90d.tar.gz | |
Fix bug #53913 (Streams functions assume HAVE_GLOB is defined). Patch by Chris
Jones.
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/plain_wrapper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 96332df843..9676e323d4 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -855,9 +855,11 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, char DIR *dir = NULL; php_stream *stream = NULL; +#ifdef HAVE_GLOB if (options & STREAM_USE_GLOB_DIR_OPEN) { return php_glob_stream_wrapper.wops->dir_opener(&php_glob_stream_wrapper, path, mode, options, opened_path, context STREAMS_REL_CC TSRMLS_CC); } +#endif if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; |