summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-03-17 13:43:29 -0400
committerThe Android Automerger <android-build@android.com>2011-03-21 15:04:16 -0700
commit7b37c76fec303c8fe9b2a85df12c0e5e21f059fb (patch)
treea66896f3a17711e280b02b1f12c2c46a6fc01a0f
parent6f400b68f091edc36db750f8742f9bcbf4f6d7b2 (diff)
downloadexternal_webkit-7b37c76fec303c8fe9b2a85df12c0e5e21f059fb.zip
external_webkit-7b37c76fec303c8fe9b2a85df12c0e5e21f059fb.tar.gz
external_webkit-7b37c76fec303c8fe9b2a85df12c0e5e21f059fb.tar.bz2
Turns out args should not be decoded twice.
This should help out in some cases with redirect/login loops. Bug: 4110115 Change-Id: I42fff7e9227423b9b5ce94234ad6d606234fe252
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 49eac3c..7d1adb0 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1023,9 +1023,6 @@ void WebFrame::autoLogin(const std::string& loginHeader)
if (realm.isEmpty() || args.isEmpty())
return;
- // Args is double-encoded as it contains urls.
- args = WebCore::decodeURLEscapeSequences(args);
-
JNIEnv* env = getJNIEnv();
jstring jRealm = wtfStringToJstring(env, realm, true);
jstring jAccount = wtfStringToJstring(env, account);