From 54069551f0f1a6e8ae6144d6aeb12a0feb9b9e15 Mon Sep 17 00:00:00 2001
From: "andreas.otte%primus-online.de"
 <andreas.otte%primus-online.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 6 Oct 2001 12:08:44 +0000
Subject: [PATCH] fix bug 32895 [Converting \ to / in urls on windows only
 (was: RFC 2396 $2.4.3 non-compliance?)] We no longer convert \ to / inside
 the core urlparser on windows only. Conversion from filepath to url still
 does. r=dougt@netscape.com sr=darin@netscape.com

git-svn-id: svn://10.0.0.236/trunk@104736 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/netwerk/base/src/nsNoAuthURLParser.cpp |  4 ++--
 mozilla/netwerk/base/src/nsURLHelper.cpp       | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp b/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
index af942c4e127..3eaddac2134 100644
--- a/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
+++ b/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
@@ -293,11 +293,11 @@ nsNoAuthURLParser::ParseAtDirectory(const char* i_Path, char* *o_Directory,
                 !(*(dirfile+2) == ':' || *(dirfile+2) == '|')) {
                 nsCAutoString tempdir;
                 if (PL_strlen(dirfile) < 2 || (PL_strlen(dirfile) >= 2 &&
-                   *(dirfile+1) != '/' && *(dirfile+1) != '\\')) {
+                   *(dirfile+1) != '/')) {
                     tempdir += "/";
                 }
                 if (PL_strlen(dirfile) < 3 || (PL_strlen(dirfile) >= 3 &&
-                   *(dirfile+2) != '/' && *(dirfile+2) != '\\')) {
+                   *(dirfile+2) != '/')) {
                     tempdir += "/";
                 }
                 tempdir += dirfile;
diff --git a/mozilla/netwerk/base/src/nsURLHelper.cpp b/mozilla/netwerk/base/src/nsURLHelper.cpp
index 30335c8e80c..0c5caa6c201 100644
--- a/mozilla/netwerk/base/src/nsURLHelper.cpp
+++ b/mozilla/netwerk/base/src/nsURLHelper.cpp
@@ -91,7 +91,6 @@ DupString(char* *o_Dest, const char* i_Src)
 }
 
 // Replace all /./ with a /
-// Also changes all \ to / 
 // But only till #? 
 NS_NET void 
 CoaleseDirs(char* io_Path)
@@ -119,13 +118,7 @@ CoaleseDirs(char* io_Path)
         }
 #endif
 
-#if defined(XP_WIN) || defined(XP_OS2)
-        if (*fwdPtr == '\\')
-            *fwdPtr = '/';
-#endif
-
-        if (*fwdPtr == '/' && *(fwdPtr+1) == '.' && 
-            (*(fwdPtr+2) == '/' || *(fwdPtr+2) == '\\'))
+        if (*fwdPtr == '/' && *(fwdPtr+1) == '.' && *(fwdPtr+2) == '/' )
         {
             // remove . followed by slash
             fwdPtr += 1;
@@ -134,8 +127,7 @@ CoaleseDirs(char* io_Path)
                 (*(fwdPtr+3) == '/' || 
                     *(fwdPtr+3) == '\0' || // This will take care of 
                     *(fwdPtr+3) == '?' ||  // something like foo/bar/..#sometag
-                    *(fwdPtr+3) == '#' ||
-                    *(fwdPtr+3) == '\\'))
+                    *(fwdPtr+3) == '#'))
         {
             // remove foo/.. 
             // reverse the urlPtr to the previous slash