Merge "Fix for 2585858, load invalid urls." into froyo

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java
index 906264a03038..7fd993a209e9 100644
--- a/core/java/android/webkit/FrameLoader.java
+++ b/core/java/android/webkit/FrameLoader.java
@@ -102,8 +102,9 @@ class FrameLoader {
                                 com.android.internal.R.string.httpErrorBadUrl));
                 return false;
             }
-            // Make sure it is correctly URL encoded before sending the request
-            if (!URLUtil.verifyURLEncoding(url)) {
+            // Make sure the host part of the url is correctly
+            // encoded before sending the request
+            if (!URLUtil.verifyURLEncoding(mListener.host())) {
                 mListener.error(EventHandler.ERROR_BAD_URL,
                         mListener.getContext().getString(
                         com.android.internal.R.string.httpErrorBadUrl));