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