Fix bug #53913 (Streams functions assume HAVE_GLOB is defined). Patch by Chris

Jones.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 53bbef4443054ef38ffefb9f6c90ba1c01e60e09..384908ebcef7965f8529b75636cedbd4b4043190 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3613,7 +3613,9 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 
        php_register_url_stream_wrapper("php", &php_stream_php_wrapper TSRMLS_CC);
        php_register_url_stream_wrapper("file", &php_plain_files_wrapper TSRMLS_CC);
+#ifdef HAVE_GLOB
        php_register_url_stream_wrapper("glob", &php_glob_stream_wrapper TSRMLS_CC);
+#endif
        php_register_url_stream_wrapper("data", &php_stream_rfc2397_wrapper TSRMLS_CC);
 #ifndef PHP_CURL_URL_WRAPPERS
        php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC);

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 7c48a8eb9d5c4de6f69fea645cc70bbeca7a5c55..b345a186d7911d6b85825e9684a3a48b7df377ed 100644 (file)
--- 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;