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

Fix the cookie order. If multiple cookies satisfy the criteria, the one with

Browse Source 
more specfic Path precede thoese with less specific.
This commit is contained in:
Grace Kloba
2009-08-03 10:05:39 -07:00
parent a05f75d61a
commit f4046ba803
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,12 @@ import android.util.Log;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
/**
* CookieManager manages cookies according to RFC2109 spec.
@@ -190,6 +193,14 @@ public final class CookieManager {
}
}
private static final CookieComparator COMPARATOR = new CookieComparator();
private static final class CookieComparator implements Comparator<Cookie> {
public int compare(Cookie cookie1, Cookie cookie2) {
return cookie2.path.length() - cookie1.path.length();
}
}
private CookieManager() {
}
@@ -401,8 +412,8 @@ public final class CookieManager {
long now = System.currentTimeMillis();
boolean secure = HTTPS.equals(uri.mScheme);
Iterator<Cookie> iter = cookieList.iterator();
StringBuilder ret = new StringBuilder(256);
SortedSet<Cookie> cookieSet = new TreeSet<Cookie>(COMPARATOR);
while (iter.hasNext()) {
Cookie cookie = iter.next();
if (cookie.domainMatch(hostAndPath[0]) &&
@@ -413,19 +424,26 @@ public final class CookieManager {
&& (!cookie.secure || secure)
&& cookie.mode != Cookie.MODE_DELETED) {
cookie.lastAcessTime = now;
if (ret.length() > 0) {
ret.append(SEMICOLON);
// according to RC2109, SEMICOLON is office separator,
// but when log in yahoo.com, it needs WHITE_SPACE too.
ret.append(WHITE_SPACE);
}
ret.append(cookie.name);
ret.append(EQUAL);
ret.append(cookie.value);
cookieSet.add(cookie);
}
}
StringBuilder ret = new StringBuilder(256);
Iterator<Cookie> setIter = cookieSet.iterator();
while (setIter.hasNext()) {
Cookie cookie = setIter.next();
if (ret.length() > 0) {
ret.append(SEMICOLON);
// according to RC2109, SEMICOLON is official separator,
// but when log in yahoo.com, it needs WHITE_SPACE too.
ret.append(WHITE_SPACE);
}
ret.append(cookie.name);
ret.append(EQUAL);
ret.append(cookie.value);
}
if (ret.length() > 0) {
if (DebugFlags.COOKIE_MANAGER) {
Log.v(LOGTAG, "getCookie: uri: " + uri + " value: " + ret);