bjori Tue Dec 9 09:03:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/standard dir.c
Log:
MFH: - Changed opendir/dir/scandir to use default context when no context
argument is passed. (Sara)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.403&r2=1.2027.2.547.2.965.2.404&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.403
php-src/NEWS:1.2027.2.547.2.965.2.404
--- php-src/NEWS:1.2027.2.547.2.965.2.403 Wed Dec 3 21:01:52 2008
+++ php-src/NEWS Tue Dec 9 09:03:37 2008
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, PHP 5.3.0 Alpha 4
+- Changed opendir/dir/scandir to use default context
+ when no context argument is passed. (Sara)
04 Dec 2008, PHP 5.3.0 Alpha 3
- Upgraded bundled PCRE to version 7.8. (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.11&r2=1.147.2.3.2.12.2.12&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.12
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11 Mon Aug 11 23:14:36 2008
+++ php-src/ext/standard/dir.c Tue Dec 9 09:03:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.11 2008/08/11 23:14:36 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.12 2008/12/09 09:03:38 bjori Exp $ */
/* {{{ includes/startup/misc */
@@ -213,9 +213,7 @@
RETURN_NULL();
}
- if (zcontext) {
- context = php_stream_context_from_zval(zcontext, 0);
- }
+ context = php_stream_context_from_zval(zcontext, 0);
dirp = php_stream_opendir(dirname, ENFORCE_SAFE_MODE|REPORT_ERRORS,
context);
@@ -558,9 +556,7 @@
RETURN_FALSE;
}
- if (zcontext) {
- context = php_stream_context_from_zval(zcontext, 0);
- }
+ context = php_stream_context_from_zval(zcontext, 0);
if (!flags) {
n = php_stream_scandir(dirn, &namelist, context, (void *)
php_stream_dirent_alphasort);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
