cvs: php4 /main fopen-wrappers.c
| From: | Andi Gutmans | Date: | Fri, 16 Jun 2000 01:14:08 +0000 |
| Subject: | cvs: php4 /main fopen-wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-301@lists.php.net to get a copy of this message | ||
andi Thu Jun 15 18:14:08 2000 EDT
Modified files:
/php4/main fopen-wrappers.c
Log:
- Last patch for tonight. A more optimized way to check for absolute path
- in Windows. This should be fixed to use the virtual cwd macro for
- ABSOLUTE_DIR() but I need to have time to understand the logic first
Index: php4/main/fopen-wrappers.c
diff -u php4/main/fopen-wrappers.c:1.65 php4/main/fopen-wrappers.c:1.66
--- php4/main/fopen-wrappers.c:1.65 Thu Jun 15 18:08:39 2000
+++ php4/main/fopen-wrappers.c Thu Jun 15 18:14:08 2000
@@ -16,7 +16,7 @@
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen-wrappers.c,v 1.65 2000/06/16 01:08:39 andi Exp $ */
+/* $Id: fopen-wrappers.c,v 1.66 2000/06/16 01:14:08 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -327,7 +327,8 @@
#endif
#ifdef PHP_WIN32
if (PG(doc_root) && path_info && (IS_SLASH(*PG(doc_root))
- || strstr(PG(doc_root),":\\") || strstr(PG(doc_root),":/"))) {
+ /* Check for absolute path. This should also use virtual cwd macros */
+ || (PG(doc_root)[1] == ':' && IS_SLASH(PG(doc_root)[2]))) {
#else
if (PG(doc_root) && path_info && IS_SLASH(*PG(doc_root))) {
#endif