From 4f6c55ad67f8e080d5bc3adba124f5e76d9f0224 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Fri, 20 Jan 2017 14:54:37 +0000
Subject: [PATCH] [AMQ-6571] use browsercompatspec cookie matcher - apply patch
 from Andrew Flegg with thanks

---
 .../transport/http/HttpClientTransport.java   |  3 +
 .../HttpClientTransportCookiePolicyTest.java  | 61 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientTransportCookiePolicyTest.java

diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
index a06e7fd749..153e5d6dd9 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
@@ -47,6 +47,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpOptions;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.params.CookiePolicy;
+import org.apache.http.client.params.HttpClientParams;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.params.ConnRoutePNames;
 import org.apache.http.conn.scheme.PlainSocketFactory;
@@ -342,6 +344,7 @@ public class HttpClientTransport extends HttpTransportSupport {
 
         HttpParams params = client.getParams();
         HttpConnectionParams.setSoTimeout(params, soTimeout);
+        HttpClientParams.setCookiePolicy(params, CookiePolicy.BROWSER_COMPATIBILITY);
 
         return client;
     }
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientTransportCookiePolicyTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientTransportCookiePolicyTest.java
new file mode 100644
index 0000000000..b0f5691682
--- /dev/null
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientTransportCookiePolicyTest.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.activemq.transport.util.TextWireFormat;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.params.HttpClientParams;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test that {@link HttpClientTransport} sets a broad-range compatibility
+ * cookie policy.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/AMQ-6571">AMQ-6571: HttpClientTransport refuses to accept cookies using `Expires' header</a>
+ */
+@SuppressWarnings("deprecation")
+public class HttpClientTransportCookiePolicyTest {
+
+    private HttpClientTransport transport;
+
+
+    /**
+     * Create the transport so we can inspect it.
+     * @throws URISyntaxException if something goes wrong.
+     */
+    @Before
+    public void setUp() throws URISyntaxException {
+        transport = new HttpClientTransport(mock(TextWireFormat.class), new URI("http://localhost:8080/test"));
+    }
+
+
+    /**
+     * Create a new connection and check the connection properties.
+     */
+    @Test
+    public void test() {
+        HttpClient client = transport.createHttpClient();
+        assertEquals("Cookie spec", org.apache.http.client.params.CookiePolicy.BROWSER_COMPATIBILITY, HttpClientParams.getCookiePolicy(client.getParams()));
+    }
+}