diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index da5117beaff..c40a71f86b0 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2080,19 +2080,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, spaceLoc = urlStr.FindChar(' '); PRBool keyword = PR_FALSE; - if ( (qMarkLoc == 0) -#ifdef XP_PC - // This is windows only because windows is the - // only platform that utilizes WINS resolution - // (a DNS fallback) which can take several minutes to - // fail a resolve call if the host does not exist. - // Thus, this forces us to bypass DNS/WINS altogether - // on windows; for nonQualifiedHosts *only*. - - // "nonQualifiedHost" - || ( (qMarkLoc == -1) && (spaceLoc == -1) ) -#endif // XP_PC - ) { + if (qMarkLoc == 0) { keyword = PR_TRUE; } else if ( (spaceLoc > 0) && ( (qMarkLoc == -1) || (spaceLoc < qMarkLoc) )) { diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index da5117beaff..c40a71f86b0 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2080,19 +2080,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, spaceLoc = urlStr.FindChar(' '); PRBool keyword = PR_FALSE; - if ( (qMarkLoc == 0) -#ifdef XP_PC - // This is windows only because windows is the - // only platform that utilizes WINS resolution - // (a DNS fallback) which can take several minutes to - // fail a resolve call if the host does not exist. - // Thus, this forces us to bypass DNS/WINS altogether - // on windows; for nonQualifiedHosts *only*. - - // "nonQualifiedHost" - || ( (qMarkLoc == -1) && (spaceLoc == -1) ) -#endif // XP_PC - ) { + if (qMarkLoc == 0) { keyword = PR_TRUE; } else if ( (spaceLoc > 0) && ( (qMarkLoc == -1) || (spaceLoc < qMarkLoc) )) {