Uptake cookie parsing/serialization changes from Grizzly.

Author: rlubke

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -197,7 +197,10 @@ public Response prepareResponse(HttpResponseStatus status,
                                     HttpResponseHeaders headers,
                                     List<HttpResponseBodyPart> bodyParts) {
 
-        return new GrizzlyResponse(status, headers, bodyParts);
+        return new GrizzlyResponse(status,
+                                   headers,
+                                   bodyParts,
+                                   clientConfig.isRfc6265CookieEncoding());
 
     }
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyResponse.java

@@ -14,6 +14,7 @@
 package org.asynchttpclient.providers.grizzly;
 
 import static org.asynchttpclient.util.MiscUtil.isNonEmpty;
+import static org.glassfish.grizzly.http.CookiesBuilder.ServerCookiesBuilder;
 
 import org.asynchttpclient.Cookie;
 import org.asynchttpclient.HttpResponseBodyPart;
@@ -24,7 +25,6 @@
 
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.http.Cookies;
-import org.glassfish.grizzly.http.CookiesBuilder;
 import org.glassfish.grizzly.utils.Charsets;
 import org.glassfish.grizzly.memory.Buffers;
 import org.glassfish.grizzly.memory.MemoryManager;
@@ -46,15 +46,17 @@
  */
 public class GrizzlyResponse extends ResponseBase {
     private final Buffer responseBody;
+    private final Boolean rfc6265Enabled;
 
     // ------------------------------------------------------------ Constructors
 
 
     public GrizzlyResponse(final HttpResponseStatus status,
                            final HttpResponseHeaders headers,
-                           final List<HttpResponseBodyPart> bodyParts) {
+                           final List<HttpResponseBodyPart> bodyParts,
+                           final boolean rfc6265Enabled) {
         super(status, headers, bodyParts);
-
+        this.rfc6265Enabled = rfc6265Enabled;
         if (isNonEmpty(bodyParts)) {
             if (bodyParts.size() == 1) {
                 responseBody = ((GrizzlyResponseBodyPart) bodyParts.get(0)).getBodyBuffer();
@@ -157,7 +159,7 @@ public List<Cookie> buildCookies() {
 
         List<String> values = headers.getHeaders().get("set-cookie");
         if (isNonEmpty(values)) {
-            CookiesBuilder.ServerCookiesBuilder builder = new CookiesBuilder.ServerCookiesBuilder(false);
+            ServerCookiesBuilder builder = new ServerCookiesBuilder(false, rfc6265Enabled);
             for (String header : values) {
                 builder.parse(header);
             }

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java

@@ -392,7 +392,7 @@ private void addGeneralHeaders(final Request request,
     }
 
 
-    private static void addCookies(final Request request,
+    private void addCookies(final Request request,
                                    final HttpRequestPacket requestPacket) {
 
         final Collection<Cookie> cookies = request.getCookies();
@@ -401,7 +401,7 @@ private static void addCookies(final Request request,
             org.glassfish.grizzly.http.Cookie[] gCookies =
                     new org.glassfish.grizzly.http.Cookie[cookies.size()];
             convertCookies(cookies, gCookies);
-            CookieSerializerUtils.serializeClientCookies(sb, gCookies);
+            CookieSerializerUtils.serializeClientCookies(sb, false, config.isRfc6265CookieEncoding(), gCookies);
             requestPacket.addHeader(Header.Cookie, sb.toString());
         }