iliaa Sun May 9 15:01:28 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard dir.c
Log:
MFH: Fixed bug #28289 (incorrect resolving of relative paths by glob() in
windows).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.655&r2=1.1247.2.656&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.655 php-src/NEWS:1.1247.2.656
--- php-src/NEWS:1.1247.2.655 Sun May 9 13:34:01 2004
+++ php-src/NEWS Sun May 9 15:01:26 2004
@@ -8,6 +8,8 @@
with multiple result sets returned. (Frank)
- Fixed logic bug in session_register() which allowed registering _SESSION
and/or HTTP_SESSION_VARS. (Sara)
+- Fixed bug #28289 (incorrect resolving of relative paths by glob() in
+ windows). (Ilia)
- Fixed bug #28229 (run-tests tripped up by spaces in names). (Marcus)
- Fixed bug #28228 (number_format() does not allow empty decimal separator).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.109.2.14&r2=1.109.2.15&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.14 php-src/ext/standard/dir.c:1.109.2.15
--- php-src/ext/standard/dir.c:1.109.2.14 Tue Mar 16 18:23:26 2004
+++ php-src/ext/standard/dir.c Sun May 9 15:01:27 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.109.2.14 2004/03/16 23:23:26 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.15 2004/05/09 19:01:27 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -370,11 +370,13 @@
if (!result) {
cwd[0] = '\0';
}
- cwd_skip = strlen(cwd)+1;
#ifdef PHP_WIN32
- if (IS_SLASH(cwd[0]) && !IS_UNC_PATH(pattern, pattern_len)) {
+ if (!IS_SLASH(cwd[0])) {
cwd[2] = '\0';
+ cwd_skip = 3;
}
+#else
+ cwd_skip = strlen(cwd)+1;
#endif
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
