Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78eab1b1 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 86192c61: Merge change 21442 into eclair 

Merge commit '86192c61'

* commit '86192c61':
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
parents 5dd98cc0 86192c61

core/java/android/webkit/CookieManager.java

+4 −2
Original line number Diff line number Diff line
@@ -833,22 +833,24 @@ public final class CookieManager { 


                // "secure" is a known attribute doesn't use "=";

                // while sites like live.com uses "secure="

                if (length - index > SECURE_LENGTH

                if (length - index >= SECURE_LENGTH

                        && cookieString.substring(index, index + SECURE_LENGTH).

                        equalsIgnoreCase(SECURE)) {

                    index += SECURE_LENGTH;

                    cookie.secure = true;

                    if (index == length) break;

                    if (cookieString.charAt(index) == EQUAL) index++;

                    continue;

                }



                // "httponly" is a known attribute doesn't use "=";

                // while sites like live.com uses "httponly="

                if (length - index > HTTP_ONLY_LENGTH

                if (length - index >= HTTP_ONLY_LENGTH

                        && cookieString.substring(index,

                            index + HTTP_ONLY_LENGTH).

                        equalsIgnoreCase(HTTP_ONLY)) {

                    index += HTTP_ONLY_LENGTH;

                    if (index == length) break;

                    if (cookieString.charAt(index) == EQUAL) index++;

                    // FIXME: currently only parse the attribute

                    continue;