You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/02/21 17:12:29 UTC
svn commit: r510081 - in /jakarta/httpcomponents/httpclient/trunk/src:
examples/org/apache/http/examples/client/ java/org/apache/http/impl/client/
java/org/apache/http/impl/conn/
Author: rolandw
Date: Wed Feb 21 08:12:28 2007
New Revision: 510081
URL: http://svn.apache.org/viewvc?view=rev&rev=510081
Log:
fixed revised fix for default port, fixed target host in context, updated client examples
Modified:
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java?view=diff&rev=510081&r1=510080&r2=510081
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java Wed Feb 21 08:12:28 2007
@@ -102,7 +102,7 @@
HttpClient client = createHttpClient();
- HttpRequest req = createRequest(target);
+ HttpRequest req = createRequest();
System.out.println("executing request to " + target);
HttpEntity entity = null;
@@ -187,20 +187,14 @@
/**
* Creates a request to execute in this example.
- * In a real application, request interceptors should be used
- * to add the required headers.
- *
- * @param target the target server for the request
*
* @return a request without an entity
*/
- private final static HttpRequest createRequest(HttpHost target) {
+ private final static HttpRequest createRequest() {
HttpRequest req = new BasicHttpRequest
("GET", "/", HttpVersion.HTTP_1_1);
//("OPTIONS", "*", HttpVersion.HTTP_1_1);
-
- req.addHeader("Host", target.getHostName());
return req;
}
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java?view=diff&rev=510081&r1=510080&r2=510081
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java Wed Feb 21 08:12:28 2007
@@ -109,7 +109,7 @@
HttpClient client = createHttpClient();
- HttpRequest req = createRequest(target);
+ HttpRequest req = createRequest();
final HttpRoute route = new HttpRoute
(target, null, proxy,
@@ -201,20 +201,14 @@
/**
* Creates a request to execute in this example.
- * In a real application, request interceptors should be used
- * to add the required headers.
- *
- * @param target the target server for the request
*
* @return a request without an entity
*/
- private final static HttpRequest createRequest(HttpHost target) {
+ private final static HttpRequest createRequest() {
HttpRequest req = new BasicHttpRequest
("GET", "/", HttpVersion.HTTP_1_1);
//("OPTIONS", "*", HttpVersion.HTTP_1_1);
-
- req.addHeader("Host", target.getHostName());
return req;
}
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java?view=diff&rev=510081&r1=510080&r2=510081
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java Wed Feb 21 08:12:28 2007
@@ -44,6 +44,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.protocol.HttpExecutionContext;
import org.apache.http.conn.HttpRoute;
import org.apache.http.conn.RouteDirector;
import org.apache.http.conn.ClientConnectionManager;
@@ -132,6 +133,8 @@
HttpRequest prepreq = prepareRequest(roureq, context);
//@@@ handle authentication here or via interceptor?
+ context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST,
+ roureq.getRoute().getTargetHost());
response = requestExec.execute(prepreq, managedConn, context);
RoutedRequest followup =
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?view=diff&rev=510081&r1=510080&r2=510081
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java Wed Feb 21 08:12:28 2007
@@ -134,9 +134,9 @@
Socket sock = sf.createSocket();
conn.announce(sock);
- sock = sf.connectSocket
- (sock, target.getHostName(), target.resolvePort(),
- local, 0, params);
+ sock = sf.connectSocket(sock, target.getHostName(),
+ schm.resolvePort(target.getPort()),
+ local, 0, params);
prepareSocket(sock, context, params);
final boolean secure = sf.isSecure(sock);