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

Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp

* commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e':
  Fix for 2585858, load invalid urls.
This commit is contained in:
Kristian Monsen
2010-04-14 12:02:10 -07:00
committed by Android Git Automerger

View File

@@ -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));