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

Commit e10809d0 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 7a573862: Merge change 5720 into donut 

Merge commit '7a573862'

* commit '7a573862':
  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.
parents 91a546d4 7a573862

core/java/android/net/http/RequestHandle.java

+3 −3
Original line number Diff line number Diff line
@@ -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")) {

core/java/android/webkit/FrameLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

}