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

Merge change 21442 into eclair

Browse Source 
* changes:
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
This commit is contained in:
Android (Google) Code Review
2009-08-17 09:19:23 -07:00
parent 6ba7ae1e4c dbdad99813
commit 86192c614c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/CookieManager.java
View File

@@ -833,22 +833,24 @@ public final class CookieManager {
// "secure" is a known attribute doesn't use "="; // "secure" is a known attribute doesn't use "=";
// while sites like live.com uses "secure=" // while sites like live.com uses "secure="
if (length - index > SECURE_LENGTH if (length - index >= SECURE_LENGTH
&& cookieString.substring(index, index + SECURE_LENGTH). && cookieString.substring(index, index + SECURE_LENGTH).
equalsIgnoreCase(SECURE)) { equalsIgnoreCase(SECURE)) {
index += SECURE_LENGTH; index += SECURE_LENGTH;
cookie.secure = true; cookie.secure = true;
if (index == length) break;
if (cookieString.charAt(index) == EQUAL) index++; if (cookieString.charAt(index) == EQUAL) index++;
continue; continue;
} }
// "httponly" is a known attribute doesn't use "="; // "httponly" is a known attribute doesn't use "=";
// while sites like live.com uses "httponly=" // while sites like live.com uses "httponly="
if (length - index > HTTP_ONLY_LENGTH if (length - index >= HTTP_ONLY_LENGTH
&& cookieString.substring(index, && cookieString.substring(index,
index + HTTP_ONLY_LENGTH). index + HTTP_ONLY_LENGTH).
equalsIgnoreCase(HTTP_ONLY)) { equalsIgnoreCase(HTTP_ONLY)) {
index += HTTP_ONLY_LENGTH; index += HTTP_ONLY_LENGTH;
if (index == length) break;
if (cookieString.charAt(index) == EQUAL) index++; if (cookieString.charAt(index) == EQUAL) index++;
// FIXME: currently only parse the attribute // FIXME: currently only parse the attribute
continue; continue;