dmitry Tue Jul 24 09:07:33 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/TSRM tsrm_virtual_cwd.c
Log:
Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard
char or trailing slash
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.846&r2=1.2027.2.547.2.847&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.846 php-src/NEWS:1.2027.2.547.2.847
--- php-src/NEWS:1.2027.2.547.2.846 Mon Jul 23 23:03:09 2007
+++ php-src/NEWS Tue Jul 24 09:07:33 2007
@@ -62,6 +62,8 @@
- Fixed bug #42072 (No warning message for clearstatcache() with arguments).
(Ilia)
- Fixed bug #42071 (ini scanner allows using NULL as option name). (Jani)
+- Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard
+ char or trailing slash. (Dmitry)
- Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani)
- Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
(bob at mroczka dot com, Jani)
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.33&r2=1.74.2.9.2.34&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.33
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.34
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.33 Mon Jul 23 08:57:04 2007
+++ TSRM/tsrm_virtual_cwd.c Tue Jul 24 09:07:33 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.33 2007/07/23 08:57:04 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.34 2007/07/24 09:07:33 dmitry Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -565,6 +565,13 @@
#endif
no_realpath:
+#ifdef TSRM_WIN32
+ if (memchr(path, '*', path_length) ||
+ memchr(path, '?', path_length)) {
+ return 1;
+ }
+#endif
+
free_path = path_copy = tsrm_strndup(path, path_length);
CWD_STATE_COPY(&old_state, state);
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
