You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/12/23 20:03:27 UTC
svn commit: r1647647 - in /httpcomponents/httpclient/trunk/httpclient/src:
main/java/org/apache/http/client/protocol/
main/java/org/apache/http/impl/cookie/
test/java/org/apache/http/client/protocol/
test/java/org/apache/http/impl/client/integration/
Author: olegk
Date: Tue Dec 23 19:03:27 2014
New Revision: 1647647
URL: http://svn.apache.org/r1647647
Log:
Do not include obsolete Cookie2 request header by default
Removed:
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=1647647&r1=1647646&r2=1647647&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Tue Dec 23 19:03:27 2014
@@ -52,7 +52,6 @@ import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.SetCookie2;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.Args;
import org.apache.http.util.TextUtils;
@@ -192,19 +191,10 @@ public class RequestAddCookies implement
final int ver = cookieSpec.getVersion();
if (ver > 0) {
- boolean needVersionHeader = false;
- for (final Cookie cookie : matchedCookies) {
- if (ver != cookie.getVersion() || !(cookie instanceof SetCookie2)) {
- needVersionHeader = true;
- }
- }
-
- if (needVersionHeader) {
- final Header header = cookieSpec.getVersionHeader();
- if (header != null) {
- // Advertise cookie version support
- request.addHeader(header);
- }
+ final Header header = cookieSpec.getVersionHeader();
+ if (header != null) {
+ // Advertise cookie version support
+ request.addHeader(header);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java?rev=1647647&r1=1647646&r2=1647647&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java Tue Dec 23 19:03:27 2014
@@ -210,7 +210,7 @@ public class DefaultCookieSpec implement
@Override
public Header getVersionHeader() {
- return strict.getVersionHeader();
+ return null;
}
@Override
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java?rev=1647647&r1=1647646&r2=1647647&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java Tue Dec 23 19:03:27 2014
@@ -472,41 +472,4 @@ public class TestRequestAddCookies {
Assert.assertEquals("name1=value; name2=value; name3=value", headers1[0].getValue());
}
- @Test
- public void testAddSpecVersionHeader() throws Exception {
- final HttpRequest request = new BasicHttpRequest("GET", "/");
-
- this.cookieStore.clear();
- final BasicClientCookie cookie1 = new BasicClientCookie("name1", "value1");
- cookie1.setVersion(0);
- cookie1.setDomain("localhost.local");
- cookie1.setPath("/");
- this.cookieStore.addCookie(cookie1);
- final BasicClientCookie cookie2 = new BasicClientCookie("name2", "value2");
- cookie2.setVersion(0);
- cookie2.setDomain("localhost.local");
- cookie2.setPath("/");
- this.cookieStore.addCookie(cookie2);
-
- final HttpRoute route = new HttpRoute(this.target, null, false);
-
- final HttpClientContext context = HttpClientContext.create();
- context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
- context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
- context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
- context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
-
- final HttpRequestInterceptor interceptor = new RequestAddCookies();
- interceptor.process(request, context);
-
- final Header[] headers1 = request.getHeaders(SM.COOKIE);
- Assert.assertNotNull(headers1);
- Assert.assertEquals(1, headers1.length);
- Assert.assertEquals("name1=value1; name2=value2", headers1[0].getValue());
- final Header[] headers2 = request.getHeaders(SM.COOKIE2);
- Assert.assertNotNull(headers2);
- Assert.assertEquals(1, headers2.length);
- Assert.assertEquals("$Version=1", headers2[0].getValue());
- }
-
}