summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-30 07:06:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-06-30 07:06:50 -0700
commit7a5738624fa78e328b5f36c687c20b9cf0eb5a60 (patch)
treea8c5e9dabb9f90b597b06c77fe31fff4496d3715
parent083928fefde7060eb69f7f45cd8e2180efa9bfe1 (diff)
parent65c0fc4fc445374c7f6e2106e6ed3d6191e45cae (diff)
downloadframeworks_base-7a5738624fa78e328b5f36c687c20b9cf0eb5a60.zip
frameworks_base-7a5738624fa78e328b5f36c687c20b9cf0eb5a60.tar.gz
frameworks_base-7a5738624fa78e328b5f36c687c20b9cf0eb5a60.tar.bz2
Merge change 5720 into donut
* changes: Fix #1876303. Even rfc2616 4.2 says that "Field names are case-insensitive.", servers including Google internal uses case-sensitive checking for "Cookie". So change it.
-rw-r--r--core/java/android/net/http/RequestHandle.java6
-rw-r--r--core/java/android/webkit/FrameLoader.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/net/http/RequestHandle.java b/core/java/android/net/http/RequestHandle.java
index c4ee5b0..6a97951 100644
--- a/core/java/android/net/http/RequestHandle.java
+++ b/core/java/android/net/http/RequestHandle.java
@@ -159,11 +159,11 @@ public class RequestHandle {
e.printStackTrace();
}
- // update the "cookie" header based on the redirected url
- mHeaders.remove("cookie");
+ // update the "Cookie" header based on the redirected url
+ mHeaders.remove("Cookie");
String cookie = CookieManager.getInstance().getCookie(mUri);
if (cookie != null && cookie.length() > 0) {
- mHeaders.put("cookie", cookie);
+ mHeaders.put("Cookie", cookie);
}
if ((statusCode == 302 || statusCode == 303) && mMethod.equals("POST")) {
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java
index 6f1b160..66ab021 100644
--- a/core/java/android/webkit/FrameLoader.java
+++ b/core/java/android/webkit/FrameLoader.java
@@ -364,7 +364,7 @@ class FrameLoader {
String cookie = CookieManager.getInstance().getCookie(
mListener.getWebAddress());
if (cookie != null && cookie.length() > 0) {
- mHeaders.put("cookie", cookie);
+ mHeaders.put("Cookie", cookie);
}
}
}