From 4db2f3e951c18c264537da6cb526e181d8c8ab5d Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Fri, 16 Jul 1999 22:45:38 +0000 Subject: [PATCH] Fix for bug 9255. We were not trimming leading and trailing whitespace from the url typed in the location bar. Now we do. git-svn-id: svn://10.0.0.236/trunk@39778 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 7 ++++++- mozilla/webshell/src/nsWebShell.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 21cf8d39fce..0229d463976 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1953,15 +1953,20 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, { nsresult rv; nsAutoString urlSpec; - convertFileToURL(nsString(aURLSpec), urlSpec); + nsString urlStr = aURLSpec; + urlStr.Trim(" ", PR_TRUE, PR_TRUE); + convertFileToURL(urlStr, urlSpec); + //#ifdef NECKO // nsCOMPtr url; // rv = NS_NewURI(getter_AddRefs(url), urlSpec); // if (NS_FAILED(rv)) return rv; //#else + PRInt32 colon, fSlash; PRUnichar port; fSlash=urlSpec.Find('/'); + // if no scheme (protocol) is found, assume http. if ( ((colon=urlSpec.Find(':')) == -1) // no colon at all diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 21cf8d39fce..0229d463976 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -1953,15 +1953,20 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, { nsresult rv; nsAutoString urlSpec; - convertFileToURL(nsString(aURLSpec), urlSpec); + nsString urlStr = aURLSpec; + urlStr.Trim(" ", PR_TRUE, PR_TRUE); + convertFileToURL(urlStr, urlSpec); + //#ifdef NECKO // nsCOMPtr url; // rv = NS_NewURI(getter_AddRefs(url), urlSpec); // if (NS_FAILED(rv)) return rv; //#else + PRInt32 colon, fSlash; PRUnichar port; fSlash=urlSpec.Find('/'); + // if no scheme (protocol) is found, assume http. if ( ((colon=urlSpec.Find(':')) == -1) // no colon at all