allow mixed-case schemes in resource URLs

Adjust the scheme to all lower case before looking up the
resource if the original was not already lower case.
This fixes http://b/2056348

1 files changed, 14 insertions, 1 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 9cc5e90..f366479 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -280,13 +280,26 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader,
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
     LOGV("::WebCore:: startLoadingResource(%p, %s)",
-            loader, request.url().string().ascii().data());
+            loader, request.url().string().latin1().data());
 
     WebCore::String method = request.httpMethod();
     WebCore::HTTPHeaderMap headers = request.httpHeaderFields();
 
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     WebCore::String urlStr = request.url().string();
+    int colon = urlStr.find(':');
+    bool allLower = true;
+    for (int index = 0; index < colon; index++) {
+        UChar ch = urlStr[index];
+        if (!WTF::isASCIIAlpha(ch))
+            break;
+        allLower &= WTF::isASCIILower(ch);
+        if (index == colon - 1 && !allLower) {
+            urlStr = urlStr.substring(0, colon).lower()
+                    + urlStr.substring(colon);
+        }
+    }
+    LOGV("%s lower=%s", __FUNCTION__, urlStr.latin1().data());
     jstring jUrlStr = env->NewString(urlStr.characters(), urlStr.length());
     jstring jMethodStr = NULL;
     if (!method.isEmpty())