cvs: php-src(PHP_5_2) /ext/standard dir.c
| From: | Ilia Alshanetsky | Date: | Wed, 14 Nov 2007 23:45:39 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard dir.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47183@lists.php.net to get a copy of this message | ||
iliaa Wed Nov 14 23:45:39 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dir.c
Log:
MFB: Don't show file names being examined
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12&r2=1.147.2.3.2.13&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12 php-src/ext/standard/dir.c:1.147.2.3.2.13
--- php-src/ext/standard/dir.c:1.147.2.3.2.12 Wed Sep 19 22:37:58 2007
+++ php-src/ext/standard/dir.c Wed Nov 14 23:45:39 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12 2007/09/19 22:37:58 iliaa Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.13 2007/11/14 23:45:39 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -467,7 +467,7 @@
array_init(return_value);
for (n = 0; n < globbuf.gl_pathc; n++) {
if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
- if (PG(safe_mode) && (!php_checkuid(globbuf.gl_pathv[n], NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
+ if (PG(safe_mode) && (!php_checkuid_ex(globbuf.gl_pathv[n], NULL,
CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS))) {
basedir_limit = 1;
continue;
} else if (php_check_open_basedir_ex(globbuf.gl_pathv[n], 0 TSRMLS_CC)) {