You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/01/20 14:55:01 UTC
activemq git commit: [AMQ-6571] use browsercompatspec cookie matcher
- apply patch from Andrew Flegg with thanks
Repository: activemq
Updated Branches:
refs/heads/master 85181d630 -> 4f6c55ad6
[AMQ-6571] use browsercompatspec cookie matcher - apply patch from Andrew Flegg with thanks
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4f6c55ad
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4f6c55ad
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4f6c55ad
Branch: refs/heads/master
Commit: 4f6c55ad67f8e080d5bc3adba124f5e76d9f0224
Parents: 85181d6
Author: gtully <ga...@gmail.com>
Authored: Fri Jan 20 14:54:37 2017 +0000
Committer: gtully <ga...@gmail.com>
Committed: Fri Jan 20 14:54:37 2017 +0000
----------------------------------------------------------------------
.../transport/http/HttpClientTransport.java | 3 +
.../HttpClientTransportCookiePolicyTest.java | 61 ++++++++++++++++++++
2 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/4f6c55ad/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.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 a06e7fd..153e5d6 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;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/4f6c55ad/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientTransportCookiePolicyTest.java
----------------------------------------------------------------------
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 0000000..b0f5691
--- /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()));
+ }
+}