svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/spl/spl_directory.c trunk/ext/spl/spl_directory.c

bjori Fri, 30 Sep 2011 14:12:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317499 Log: Use the default stream context for FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c U php/php-src/trunk/ext/spl/spl_directory.c Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-09-30 14:11:20 UTC (rev 317498) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-30 14:12:26 UTC (rev 317499) @@ -17,6 +17,10 @@ . 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) Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c 2011-09-30 14:11:20 UTC (rev 317498) +++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c 2011-09-30 14:12:26 UTC (rev 317499) @@ -225,7 +225,7 @@ 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); Modified: php/php-src/trunk/ext/spl/spl_directory.c =================================================================== --- php/php-src/trunk/ext/spl/spl_directory.c 2011-09-30 14:11:20 UTC (rev 317498) +++ php/php-src/trunk/ext/spl/spl_directory.c 2011-09-30 14:12:26 UTC (rev 317499) @@ -225,7 +225,7 @@ 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);