Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kristian Monsen
2010-04-14 02:22:18 -07:00
committed by Android (Google) Code Review
parent 53c0c0daf4 b2d95503fd
commit d503a1524a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/FrameLoader.java
View File

@@ -102,8 +102,9 @@ class FrameLoader {
com.android.internal.R.string.httpErrorBadUrl)); com.android.internal.R.string.httpErrorBadUrl));
return false; return false;
} }
// Make sure it is correctly URL encoded before sending the request // Make sure the host part of the url is correctly
if (!URLUtil.verifyURLEncoding(url)) { // encoded before sending the request
if (!URLUtil.verifyURLEncoding(mListener.host())) {
mListener.error(EventHandler.ERROR_BAD_URL, mListener.error(EventHandler.ERROR_BAD_URL,
mListener.getContext().getString( mListener.getContext().getString(
com.android.internal.R.string.httpErrorBadUrl)); com.android.internal.R.string.httpErrorBadUrl));