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 2009/06/02 20:18:51 UTC
svn commit: r781111 - in /httpcomponents/httpcore/trunk: RELEASE_NOTES.txt
httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java
httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
Author: olegk
Date: Tue Jun 2 18:18:51 2009
New Revision: 781111
URL: http://svn.apache.org/viewvc?rev=781111&view=rev
Log:
HTTPCORE-198: CONNECT request includes Host header for HTTP 1.1 connections
Modified:
httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
Modified: httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=781111&r1=781110&r2=781111&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Tue Jun 2 18:18:51 2009
@@ -1,6 +1,9 @@
Changes since 4.0
-------------------
+* [HTTPCORE-198] CONNECT request includes Host header for HTTP 1.1 connections.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
* [HTTPCORE-196] SSLIOSession now unwraps encrypted data more aggressively eliminating long
pauses when receiving data over non-blocking connections.
Contributed by Oleg Kalnichevski <olegk at apache.org>
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java?rev=781111&r1=781110&r2=781111&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java Tue Jun 2 18:18:51 2009
@@ -65,8 +65,9 @@
throw new IllegalArgumentException("HTTP context may not be null");
}
+ ProtocolVersion ver = request.getRequestLine().getProtocolVersion();
String method = request.getRequestLine().getMethod();
- if (method.equalsIgnoreCase("CONNECT")) {
+ if (method.equalsIgnoreCase("CONNECT") && ver.lessEquals(HttpVersion.HTTP_1_0)) {
return;
}
@@ -86,7 +87,6 @@
}
}
if (targethost == null) {
- ProtocolVersion ver = request.getRequestLine().getProtocolVersion();
if (ver.lessEquals(HttpVersion.HTTP_1_0)) {
return;
} else {
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java?rev=781111&r1=781110&r2=781111&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java Tue Jun 2 18:18:51 2009
@@ -399,6 +399,29 @@
}
}
+ public void testRequestTargetHostConnectHttp11() throws Exception {
+ HttpContext context = new BasicHttpContext(null);
+ HttpHost host = new HttpHost("somehost", 8080, "http");
+ context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
+ BasicHttpRequest request = new BasicHttpRequest("CONNECT", "/");
+ RequestTargetHost interceptor = new RequestTargetHost();
+ interceptor.process(request, context);
+ Header header = request.getFirstHeader(HTTP.TARGET_HOST);
+ assertNotNull(header);
+ assertEquals("somehost:8080", header.getValue());
+ }
+
+ public void testRequestTargetHostConnectHttp10() throws Exception {
+ HttpContext context = new BasicHttpContext(null);
+ HttpHost host = new HttpHost("somehost", 8080, "http");
+ context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
+ BasicHttpRequest request = new BasicHttpRequest("CONNECT", "/", HttpVersion.HTTP_1_0);
+ RequestTargetHost interceptor = new RequestTargetHost();
+ interceptor.process(request, context);
+ Header header = request.getFirstHeader(HTTP.TARGET_HOST);
+ assertNull(header);
+ }
+
public void testRequestUserAgentGenerated() throws Exception {
HttpContext context = new BasicHttpContext(null);
BasicHttpRequest request = new BasicHttpRequest("GET", "/");