Use the default stream context for FilesystemIterator, GlobIterator and (Recursive...

diff --git a/NEWS b/NEWS
index 95b82b694042195c339704c3d2b80acdc5af2b72..8afdb8924c070879a8b597fafedb88a7d662794c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP                                                                        NEWS
   . Fixed bug #55544 (ob_gzhandler always conflicts with 
     zlib.output_compression). (Mike)
 
+- SPL:
+  . FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator now use
+    the default stream context. (Hannes)
+
 - CLI SAPI:
   . Fixed bug #55726 (Changing the working directory makes router script
     inaccessible). (Laruence)

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b50e71a601a481f30a60e46dfb9345452620fe49..0383be28ed49c74a6ba3504575282dd1ff6cd665 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -225,7 +225,7 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
 
        intern->type = SPL_FS_DIR;
        intern->_path_len = strlen(path);
-       intern->u.dir.dirp = php_stream_opendir(path, REPORT_ERRORS, NULL);
+       intern->u.dir.dirp = php_stream_opendir(path, REPORT_ERRORS, FG(default_context));
 
        if (intern->_path_len > 1 && IS_SLASH_AT(path, intern->_path_len-1)) {
                intern->_path = estrndup(path, --intern->_path_len);