iliaa Mon Jun 7 14:31:16 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard dir.c
Log:
MFH: Fixed bug #28668 (glob() does not work with relative paths on Windows)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.677&r2=1.1247.2.678&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.677 php-src/NEWS:1.1247.2.678
--- php-src/NEWS:1.1247.2.677 Mon Jun 7 09:51:58 2004
+++ php-src/NEWS Mon Jun 7 14:31:15 2004
@@ -3,6 +3,8 @@
?? ??? 2004, Version 4.3.8
- Fixed bug #28670 (WWW-Authentication header mangling with PCRE in safe_mode
adds extra spaces). (Ilia)
+- Fixed bug #28668 (glob() does not work with relative paths on Windows).
+ (Ilia)
- Fixed bug #28649 (Proper glob() return value on Linux when there are no
matches). (Ilia)
- Fixed bug #28632 (Prevent open_basedir bypass via MySQL's LOAD DATA LOCAL).
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.109.2.17&r2=1.109.2.18&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.17 php-src/ext/standard/dir.c:1.109.2.18
--- php-src/ext/standard/dir.c:1.109.2.17 Sun Jun 6 12:21:30 2004
+++ php-src/ext/standard/dir.c Mon Jun 7 14:31:15 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.109.2.17 2004/06/06 16:21:30 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.18 2004/06/07 18:31:15 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -371,13 +371,12 @@
cwd[0] = '\0';
}
#ifdef PHP_WIN32
- if (!IS_SLASH(cwd[0])) {
+ if (IS_SLASH(*pattern)) {
cwd[2] = '\0';
- cwd_skip = 3;
}
-#else
- cwd_skip = strlen(cwd)+1;
#endif
+ cwd_skip = strlen(cwd)+1;
+
snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH,
pattern);
pattern = work_pattern;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
