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 2010/10/21 21:59:19 UTC
svn commit: r1026121 - in
/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples:
client/ conn/
Author: olegk
Date: Thu Oct 21 19:59:18 2010
New Revision: 1026121
URL: http://svn.apache.org/viewvc?rev=1026121&view=rev
Log:
TABS -> SPACES
Modified:
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java Thu Oct 21 19:59:18 2010
@@ -41,7 +41,7 @@ public class ClientAbortMethod {
public final static void main(String[] args) throws Exception {
HttpClient httpclient = new DefaultHttpClient();
- HttpGet httpget = new HttpGet("http://www.apache.org/");
+ HttpGet httpget = new HttpGet("http://www.apache.org/");
System.out.println("executing request " + httpget.getURI());
HttpResponse response = httpclient.execute(httpget);
@@ -57,11 +57,11 @@ public class ClientAbortMethod {
// Do not feel like reading the response body
// Call abort on the request object
httpget.abort();
-
- // When HttpClient instance is no longer needed,
+
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java Thu Oct 21 19:59:18 2010
@@ -35,7 +35,7 @@ import org.apache.http.util.EntityUtils;
/**
* A simple example that uses HttpClient to execute an HTTP request against
- * a target site that requires user authentication.
+ * a target site that requires user authentication.
*/
public class ClientAuthentication {
@@ -43,11 +43,11 @@ public class ClientAuthentication {
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getCredentialsProvider().setCredentials(
- new AuthScope("localhost", 443),
+ new AuthScope("localhost", 443),
new UsernamePasswordCredentials("username", "password"));
-
+
HttpGet httpget = new HttpGet("https://localhost/protected");
-
+
System.out.println("executing request" + httpget.getRequestLine());
HttpResponse response = httpclient.execute(httpget);
HttpEntity entity = response.getEntity();
@@ -59,9 +59,9 @@ public class ClientAuthentication {
}
EntityUtils.consume(entity);
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java Thu Oct 21 19:59:18 2010
@@ -21,7 +21,7 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
- *
+ *
*/
package org.apache.http.examples.client;
@@ -58,14 +58,14 @@ public class ClientChunkEncodedPost {
new FileInputStream(file), -1);
reqEntity.setContentType("binary/octet-stream");
reqEntity.setChunked(true);
- // It may be more appropriate to use FileEntity class in this particular
+ // It may be more appropriate to use FileEntity class in this particular
// instance but we are using a more generic InputStreamEntity to demonstrate
// the capability to stream out data from any arbitrary source
- //
- // FileEntity entity = new FileEntity(file, "binary/octet-stream");
-
+ //
+ // FileEntity entity = new FileEntity(file, "binary/octet-stream");
+
httppost.setEntity(reqEntity);
-
+
System.out.println("executing request " + httppost.getRequestLine());
HttpResponse response = httpclient.execute(httppost);
HttpEntity resEntity = response.getEntity();
@@ -78,10 +78,10 @@ public class ClientChunkEncodedPost {
}
EntityUtils.consume(resEntity);
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java Thu Oct 21 19:59:18 2010
@@ -44,24 +44,24 @@ import org.apache.http.util.EntityUtils;
/**
- * This example demonstrates the use of a local HTTP context populated with
+ * This example demonstrates the use of a local HTTP context populated with
* custom attributes.
*/
public class ClientCustomContext {
public final static void main(String[] args) throws Exception {
-
+
HttpClient httpclient = new DefaultHttpClient();
// Create a local instance of cookie store
CookieStore cookieStore = new BasicCookieStore();
-
+
// Create local HTTP context
HttpContext localContext = new BasicHttpContext();
// Bind custom cookie store to the local context
localContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore);
-
- HttpGet httpget = new HttpGet("http://www.google.com/");
+
+ HttpGet httpget = new HttpGet("http://www.google.com/");
System.out.println("executing request " + httpget.getURI());
@@ -78,17 +78,17 @@ public class ClientCustomContext {
for (int i = 0; i < cookies.size(); i++) {
System.out.println("Local cookie: " + cookies.get(i));
}
-
+
// Consume response content
EntityUtils.consume(entity);
-
+
System.out.println("----------------------------------------");
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java Thu Oct 21 19:59:18 2010
@@ -47,14 +47,14 @@ public class ClientCustomSSL {
public final static void main(String[] args) throws Exception {
DefaultHttpClient httpclient = new DefaultHttpClient();
- KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
- FileInputStream instream = new FileInputStream(new File("my.keystore"));
+ KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+ FileInputStream instream = new FileInputStream(new File("my.keystore"));
try {
trustStore.load(instream, "nopassword".toCharArray());
} finally {
instream.close();
}
-
+
SSLSocketFactory socketFactory = new SSLSocketFactory(trustStore);
Scheme sch = new Scheme("https", 443, socketFactory);
httpclient.getConnectionManager().getSchemeRegistry().register(sch);
@@ -62,7 +62,7 @@ public class ClientCustomSSL {
HttpGet httpget = new HttpGet("https://localhost/");
System.out.println("executing request" + httpget.getRequestLine());
-
+
HttpResponse response = httpclient.execute(httpget);
HttpEntity entity = response.getEntity();
@@ -73,10 +73,10 @@ public class ClientCustomSSL {
}
EntityUtils.consume(entity);
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java Thu Oct 21 19:59:18 2010
@@ -23,7 +23,7 @@
* <http://www.apache.org/>.
*
*/
-
+
package org.apache.http.examples.client;
import java.util.concurrent.TimeUnit;
@@ -47,16 +47,16 @@ import org.apache.http.util.EntityUtils;
public class ClientEvictExpiredConnections {
public static void main(String[] args) throws Exception {
- // Create and initialize scheme registry
+ // Create and initialize scheme registry
SchemeRegistry schemeRegistry = new SchemeRegistry();
schemeRegistry.register(
new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));
-
+
ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(schemeRegistry);
cm.setMaxTotal(100);
-
+
HttpClient httpclient = new DefaultHttpClient(cm);
-
+
// create an array of URIs to perform GETs on
String[] urisToGet = {
"http://jakarta.apache.org/",
@@ -64,10 +64,10 @@ public class ClientEvictExpiredConnectio
"http://jakarta.apache.org/commons/httpclient/",
"http://svn.apache.org/viewvc/jakarta/httpcomponents/"
};
-
+
IdleConnectionEvictor connEvictor = new IdleConnectionEvictor(cm);
connEvictor.start();
-
+
for (int i = 0; i < urisToGet.length; i++) {
String requestURI = urisToGet[i];
HttpGet req = new HttpGet(requestURI);
@@ -86,26 +86,26 @@ public class ClientEvictExpiredConnectio
EntityUtils.consume(entity);
}
-
+
// Sleep 10 sec and let the connection evictor do its job
Thread.sleep(20000);
-
+
// Shut down the evictor thread
connEvictor.shutdown();
connEvictor.join();
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
public static class IdleConnectionEvictor extends Thread {
-
+
private final ClientConnectionManager connMgr;
-
+
private volatile boolean shutdown;
-
+
public IdleConnectionEvictor(ClientConnectionManager connMgr) {
super();
this.connMgr = connMgr;
@@ -128,14 +128,14 @@ public class ClientEvictExpiredConnectio
// terminate
}
}
-
+
public void shutdown() {
shutdown = true;
synchronized (this) {
notifyAll();
}
}
-
+
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java Thu Oct 21 19:59:18 2010
@@ -38,7 +38,7 @@ import org.apache.http.util.EntityUtils;
/**
* How to send a request directly using {@link HttpClient}.
- *
+ *
* @since 4.0
*/
public class ClientExecuteDirect {
@@ -66,10 +66,10 @@ public class ClientExecuteDirect {
System.out.println(EntityUtils.toString(entity));
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java Thu Oct 21 19:59:18 2010
@@ -69,10 +69,10 @@ public class ClientExecuteProxy {
System.out.println(EntityUtils.toString(entity));
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java Thu Oct 21 19:59:18 2010
@@ -81,12 +81,12 @@ public class ClientExecuteSOCKS {
System.out.println(EntityUtils.toString(entity));
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
static class MySchemeSocketFactory implements SchemeSocketFactory {
public Socket createSocket(final HttpParams params) throws IOException {
@@ -96,16 +96,16 @@ public class ClientExecuteSOCKS {
String proxyHost = (String) params.getParameter("socks.host");
Integer proxyPort = (Integer) params.getParameter("socks.port");
- InetSocketAddress socksaddr = new InetSocketAddress(proxyHost, proxyPort);
+ InetSocketAddress socksaddr = new InetSocketAddress(proxyHost, proxyPort);
Proxy proxy = new Proxy(Proxy.Type.SOCKS, socksaddr);
return new Socket(proxy);
}
public Socket connectSocket(
- final Socket socket,
+ final Socket socket,
final InetSocketAddress remoteAddress,
- final InetSocketAddress localAddress,
- final HttpParams params)
+ final InetSocketAddress localAddress,
+ final HttpParams params)
throws IOException, UnknownHostException, ConnectTimeoutException {
if (remoteAddress == null) {
throw new IllegalArgumentException("Remote address may not be null");
@@ -127,7 +127,7 @@ public class ClientExecuteSOCKS {
try {
sock.connect(remoteAddress, timeout);
} catch (SocketTimeoutException ex) {
- throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/"
+ throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/"
+ remoteAddress.getAddress() + " timed out");
}
return sock;
@@ -136,7 +136,7 @@ public class ClientExecuteSOCKS {
public boolean isSecure(final Socket sock) throws IllegalArgumentException {
return false;
}
-
+
}
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientFormLogin.java Thu Oct 21 19:59:18 2010
@@ -95,9 +95,9 @@ public class ClientFormLogin {
}
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java Thu Oct 21 19:59:18 2010
@@ -46,15 +46,15 @@ import org.apache.http.protocol.HttpCont
import org.apache.http.util.EntityUtils;
/**
- * Demonstration of the use of protocol interceptors to transparently
+ * Demonstration of the use of protocol interceptors to transparently
* modify properties of HTTP messages sent / received by the HTTP client.
* <p/>
- * In this particular case HTTP client is made capable of transparent content
+ * In this particular case HTTP client is made capable of transparent content
* GZIP compression by adding two protocol interceptors: a request interceptor
* that adds 'Accept-Encoding: gzip' header to all outgoing requests and
* a response interceptor that automatically expands compressed response
* entities by wrapping them with a uncompressing decorator class. The use of
- * protocol interceptors makes content compression completely transparent to
+ * protocol interceptors makes content compression completely transparent to
* the consumer of the {@link org.apache.http.client.HttpClient HttpClient}
* interface.
*/
@@ -64,9 +64,9 @@ public class ClientGZipContentCompressio
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.addRequestInterceptor(new HttpRequestInterceptor() {
-
+
public void process(
- final HttpRequest request,
+ final HttpRequest request,
final HttpContext context) throws HttpException, IOException {
if (!request.containsHeader("Accept-Encoding")) {
request.addHeader("Accept-Encoding", "gzip");
@@ -74,11 +74,11 @@ public class ClientGZipContentCompressio
}
});
-
+
httpclient.addResponseInterceptor(new HttpResponseInterceptor() {
-
+
public void process(
- final HttpResponse response,
+ final HttpResponse response,
final HttpContext context) throws HttpException, IOException {
HttpEntity entity = response.getEntity();
Header ceheader = entity.getContentEncoding();
@@ -87,17 +87,17 @@ public class ClientGZipContentCompressio
for (int i = 0; i < codecs.length; i++) {
if (codecs[i].getName().equalsIgnoreCase("gzip")) {
response.setEntity(
- new GzipDecompressingEntity(response.getEntity()));
+ new GzipDecompressingEntity(response.getEntity()));
return;
}
}
}
}
-
+
});
-
- HttpGet httpget = new HttpGet("http://www.apache.org/");
-
+
+ HttpGet httpget = new HttpGet("http://www.apache.org/");
+
// Execute HTTP request
System.out.println("executing request " + httpget.getURI());
HttpResponse response = httpclient.execute(httpget);
@@ -109,7 +109,7 @@ public class ClientGZipContentCompressio
System.out.println("----------------------------------------");
HttpEntity entity = response.getEntity();
-
+
if (entity != null) {
String content = EntityUtils.toString(entity);
System.out.println(content);
@@ -117,10 +117,10 @@ public class ClientGZipContentCompressio
System.out.println("Uncompressed size: "+content.length());
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
static class GzipDecompressingEntity extends HttpEntityWrapper {
@@ -128,7 +128,7 @@ public class ClientGZipContentCompressio
public GzipDecompressingEntity(final HttpEntity entity) {
super(entity);
}
-
+
@Override
public InputStream getContent()
throws IOException, IllegalStateException {
@@ -145,7 +145,7 @@ public class ClientGZipContentCompressio
return -1;
}
- }
-
+ }
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java Thu Oct 21 19:59:18 2010
@@ -44,7 +44,7 @@ import org.apache.http.util.EntityUtils;
/**
* A simple example that uses HttpClient to execute an HTTP request against
- * a target site that requires user authentication.
+ * a target site that requires user authentication.
*/
public class ClientInteractiveAuthentication {
@@ -55,7 +55,7 @@ public class ClientInteractiveAuthentica
HttpContext localContext = new BasicHttpContext();
HttpGet httpget = new HttpGet("http://localhost/test");
-
+
boolean trying = true;
while (trying) {
System.out.println("executing request " + httpget.getRequestLine());
@@ -67,34 +67,34 @@ public class ClientInteractiveAuthentica
// Consume response content
HttpEntity entity = response.getEntity();
EntityUtils.consume(entity);
-
+
int sc = response.getStatusLine().getStatusCode();
-
+
AuthState authState = null;
if (sc == HttpStatus.SC_UNAUTHORIZED) {
// Target host authentication required
authState = (AuthState) localContext.getAttribute(ClientContext.TARGET_AUTH_STATE);
- }
+ }
if (sc == HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED) {
// Proxy authentication required
authState = (AuthState) localContext.getAttribute(ClientContext.PROXY_AUTH_STATE);
}
-
+
if (authState != null) {
System.out.println("----------------------------------------");
AuthScope authScope = authState.getAuthScope();
System.out.println("Please provide credentials");
System.out.println(" Host: " + authScope.getHost() + ":" + authScope.getPort());
System.out.println(" Realm: " + authScope.getRealm());
-
-
+
+
BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
-
+
System.out.print("Enter username: ");
- String user = console.readLine();
+ String user = console.readLine();
System.out.print("Enter password: ");
String password = console.readLine();
-
+
if (user != null && user.length() > 0) {
Credentials creds = new UsernamePasswordCredentials(user, password);
httpclient.getCredentialsProvider().setCredentials(authScope, creds);
@@ -107,9 +107,9 @@ public class ClientInteractiveAuthentica
}
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java Thu Oct 21 19:59:18 2010
@@ -40,9 +40,9 @@ import org.apache.http.util.EntityUtils;
/**
* Kerberos auth example.
- *
+ *
* <p><b>Information</b></p>
- * <p>For the best compatibility use Java >= 1.6 as it supports SPNEGO authentication more
+ * <p>For the best compatibility use Java >= 1.6 as it supports SPNEGO authentication more
completely.</p>
* <p><em>NegotiateSchemeFactory</em> kas two custom methods</p>
* <p><em>#setStripPort(boolean)</em> - default is false, with strip the port off the Kerberos
@@ -92,7 +92,7 @@ import org.apache.http.util.EntityUtils;
* </pre>
* <p><b>Windows specific configuration</b></p>
* <p>
- * The registry key <em>allowtgtsessionkey</em> should be added, and set correctly, to allow
+ * The registry key <em>allowtgtsessionkey</em> should be added, and set correctly, to allow
* session keys to be sent in the Kerberos Ticket-Granting Ticket.
* </p>
* <p>
@@ -102,7 +102,7 @@ import org.apache.http.util.EntityUtils;
* HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa\Kerberos\Parameters
* Value Name: allowtgtsessionkey
* Value Type: REG_DWORD
- * Value: 0x01
+ * Value: 0x01
* </pre>
* <p>
* Here is the location of the registry setting on Windows XP SP2:
@@ -113,7 +113,7 @@ import org.apache.http.util.EntityUtils;
* Value Type: REG_DWORD
* Value: 0x01
* </pre>
- *
+ *
* @since 4.1
*/
public class ClientKerberosAuthentication {
@@ -124,13 +124,13 @@ public class ClientKerberosAuthenticatio
System.setProperty("java.security.krb5.conf", "krb5.conf");
System.setProperty("sun.security.krb5.debug", "true");
System.setProperty("javax.security.auth.useSubjectCredsOnly","false");
-
+
DefaultHttpClient httpclient = new DefaultHttpClient();
NegotiateSchemeFactory nsf = new NegotiateSchemeFactory();
// nsf.setStripPort(false);
// nsf.setSpengoGenerator(new BouncySpnegoTokenGenerator());
-
+
httpclient.getAuthSchemes().register(AuthPolicy.SPNEGO, nsf);
Credentials use_jaas_creds = new Credentials() {
@@ -142,7 +142,7 @@ public class ClientKerberosAuthenticatio
public Principal getUserPrincipal() {
return null;
}
-
+
};
httpclient.getCredentialsProvider().setCredentials(
@@ -160,14 +160,14 @@ public class ClientKerberosAuthenticatio
System.out.println(EntityUtils.toString(entity));
}
System.out.println("----------------------------------------");
-
+
// This ensures the connection gets released back to the manager
EntityUtils.consume(entity);
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java Thu Oct 21 19:59:18 2010
@@ -23,7 +23,7 @@
* <http://www.apache.org/>.
*
*/
-
+
package org.apache.http.examples.client;
import org.apache.http.HttpEntity;
@@ -41,24 +41,24 @@ import org.apache.http.util.EntityUtils;
/**
* An example that performs GETs from multiple threads.
- *
+ *
*/
public class ClientMultiThreadedExecution {
public static void main(String[] args) throws Exception {
- // Create and initialize scheme registry
+ // Create and initialize scheme registry
SchemeRegistry schemeRegistry = new SchemeRegistry();
schemeRegistry.register(
new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));
-
+
// Create an HttpClient with the ThreadSafeClientConnManager.
// This connection manager must be used if more than one thread will
// be using the HttpClient.
ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(schemeRegistry);
cm.setMaxTotal(100);
-
+
HttpClient httpClient = new DefaultHttpClient(cm);
-
+
// create an array of URIs to perform GETs on
String[] urisToGet = {
"http://hc.apache.org/",
@@ -66,60 +66,60 @@ public class ClientMultiThreadedExecutio
"http://hc.apache.org/httpcomponents-client/",
"http://svn.apache.org/viewvc/httpcomponents/"
};
-
+
// create a thread for each URI
GetThread[] threads = new GetThread[urisToGet.length];
for (int i = 0; i < threads.length; i++) {
HttpGet httpget = new HttpGet(urisToGet[i]);
threads[i] = new GetThread(httpClient, httpget, i + 1);
}
-
+
// start the threads
for (int j = 0; j < threads.length; j++) {
threads[j].start();
}
-
+
// join the threads
for (int j = 0; j < threads.length; j++) {
threads[j].join();
}
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpClient.getConnectionManager().shutdown();
+ httpClient.getConnectionManager().shutdown();
}
-
+
/**
* A thread that performs a GET.
*/
static class GetThread extends Thread {
-
+
private final HttpClient httpClient;
private final HttpContext context;
private final HttpGet httpget;
private final int id;
-
+
public GetThread(HttpClient httpClient, HttpGet httpget, int id) {
this.httpClient = httpClient;
this.context = new BasicHttpContext();
this.httpget = httpget;
this.id = id;
}
-
+
/**
* Executes the GetMethod and prints some status information.
*/
@Override
public void run() {
-
+
System.out.println(id + " - about to get something from " + httpget.getURI());
try {
-
+
// execute the method
HttpResponse response = httpClient.execute(httpget, context);
-
+
System.out.println(id + " - get executed");
// get the response body as an array of bytes
HttpEntity entity = response.getEntity();
@@ -127,13 +127,13 @@ public class ClientMultiThreadedExecutio
byte[] bytes = EntityUtils.toByteArray(entity);
System.out.println(id + " - " + bytes.length + " bytes read");
}
-
+
} catch (Exception e) {
httpget.abort();
System.out.println(id + " - error: " + e);
}
}
-
+
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java Thu Oct 21 19:59:18 2010
@@ -40,7 +40,7 @@ import org.apache.http.protocol.BasicHtt
import org.apache.http.util.EntityUtils;
/**
- * An example of HttpClient can be customized to authenticate
+ * An example of HttpClient can be customized to authenticate
* preemptively using BASIC scheme.
* <b/>
* Generally, preemptive authentication can be considered less
@@ -51,30 +51,30 @@ public class ClientPreemptiveBasicAuthen
public static void main(String[] args) throws Exception {
- HttpHost targetHost = new HttpHost("localhost", 80, "http");
-
+ HttpHost targetHost = new HttpHost("localhost", 80, "http");
+
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getCredentialsProvider().setCredentials(
- new AuthScope(targetHost.getHostName(), targetHost.getPort()),
+ new AuthScope(targetHost.getHostName(), targetHost.getPort()),
new UsernamePasswordCredentials("username", "password"));
// Create AuthCache instance
AuthCache authCache = new BasicAuthCache();
- // Generate BASIC scheme object and add it to the local
+ // Generate BASIC scheme object and add it to the local
// auth cache
BasicScheme basicAuth = new BasicScheme();
authCache.put(targetHost, basicAuth);
-
+
// Add AuthCache to the execution context
BasicHttpContext localcontext = new BasicHttpContext();
- localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
-
+ localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
+
HttpGet httpget = new HttpGet("/");
System.out.println("executing request: " + httpget.getRequestLine());
System.out.println("to target: " + targetHost);
-
+
for (int i = 0; i < 3; i++) {
HttpResponse response = httpclient.execute(targetHost, httpget, localcontext);
HttpEntity entity = response.getEntity();
@@ -86,11 +86,11 @@ public class ClientPreemptiveBasicAuthen
}
EntityUtils.consume(entity);
}
-
- // When HttpClient instance is no longer needed,
+
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java Thu Oct 21 19:59:18 2010
@@ -40,7 +40,7 @@ import org.apache.http.protocol.BasicHtt
import org.apache.http.util.EntityUtils;
/**
- * An example of HttpClient can be customized to authenticate
+ * An example of HttpClient can be customized to authenticate
* preemptively using DIGEST scheme.
* <b/>
* Generally, preemptive authentication can be considered less
@@ -51,34 +51,34 @@ public class ClientPreemptiveDigestAuthe
public static void main(String[] args) throws Exception {
- HttpHost targetHost = new HttpHost("localhost", 80, "http");
+ HttpHost targetHost = new HttpHost("localhost", 80, "http");
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getCredentialsProvider().setCredentials(
- new AuthScope(targetHost.getHostName(), targetHost.getPort()),
+ new AuthScope(targetHost.getHostName(), targetHost.getPort()),
new UsernamePasswordCredentials("username", "password"));
// Create AuthCache instance
AuthCache authCache = new BasicAuthCache();
- // Generate DIGEST scheme object, initialize it and add it to the local
+ // Generate DIGEST scheme object, initialize it and add it to the local
// auth cache
DigestScheme digestAuth = new DigestScheme();
// Suppose we already know the realm name
- digestAuth.overrideParamter("realm", "some realm");
- // Suppose we already know the expected nonce value
- digestAuth.overrideParamter("nonce", "whatever");
+ digestAuth.overrideParamter("realm", "some realm");
+ // Suppose we already know the expected nonce value
+ digestAuth.overrideParamter("nonce", "whatever");
authCache.put(targetHost, digestAuth);
-
+
// Add AuthCache to the execution context
BasicHttpContext localcontext = new BasicHttpContext();
- localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
-
+ localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
+
HttpGet httpget = new HttpGet("/");
System.out.println("executing request: " + httpget.getRequestLine());
System.out.println("to target: " + targetHost);
-
+
for (int i = 0; i < 3; i++) {
HttpResponse response = httpclient.execute(targetHost, httpget, localcontext);
HttpEntity entity = response.getEntity();
@@ -90,11 +90,11 @@ public class ClientPreemptiveDigestAuthe
}
EntityUtils.consume(entity);
}
-
- // When HttpClient instance is no longer needed,
+
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java Thu Oct 21 19:59:18 2010
@@ -36,30 +36,30 @@ import org.apache.http.impl.client.Defau
import org.apache.http.util.EntityUtils;
/**
- * A simple example that uses HttpClient to execute an HTTP request
- * over a secure connection tunneled through an authenticating proxy.
+ * A simple example that uses HttpClient to execute an HTTP request
+ * over a secure connection tunneled through an authenticating proxy.
*/
public class ClientProxyAuthentication {
public static void main(String[] args) throws Exception {
-
+
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getCredentialsProvider().setCredentials(
- new AuthScope("localhost", 8080),
+ new AuthScope("localhost", 8080),
new UsernamePasswordCredentials("username", "password"));
- HttpHost targetHost = new HttpHost("www.verisign.com", 443, "https");
- HttpHost proxy = new HttpHost("localhost", 8080);
+ HttpHost targetHost = new HttpHost("www.verisign.com", 443, "https");
+ HttpHost proxy = new HttpHost("localhost", 8080);
httpclient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
HttpGet httpget = new HttpGet("/");
-
+
System.out.println("executing request: " + httpget.getRequestLine());
System.out.println("via proxy: " + proxy);
System.out.println("to target: " + targetHost);
-
+
HttpResponse response = httpclient.execute(targetHost, httpget);
HttpEntity entity = response.getEntity();
@@ -69,10 +69,10 @@ public class ClientProxyAuthentication {
System.out.println("Response content length: " + entity.getContentLength());
}
EntityUtils.consume(entity);
-
- // When HttpClient instance is no longer needed,
+
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java Thu Oct 21 19:59:18 2010
@@ -34,16 +34,16 @@ import org.apache.http.impl.client.Basic
import org.apache.http.impl.client.DefaultHttpClient;
/**
- * This example demonstrates the use of the {@link ResponseHandler} to simplify
+ * This example demonstrates the use of the {@link ResponseHandler} to simplify
* the process of processing the HTTP response and releasing associated resources.
*/
public class ClientWithResponseHandler {
public final static void main(String[] args) throws Exception {
-
+
HttpClient httpclient = new DefaultHttpClient();
- HttpGet httpget = new HttpGet("http://www.google.com/");
+ HttpGet httpget = new HttpGet("http://www.google.com/");
System.out.println("executing request " + httpget.getURI());
@@ -54,11 +54,11 @@ public class ClientWithResponseHandler {
System.out.println(responseBody);
System.out.println("----------------------------------------");
- // When HttpClient instance is no longer needed,
+ // When HttpClient instance is no longer needed,
// shut down the connection manager to ensure
// immediate deallocation of all system resources
- httpclient.getConnectionManager().shutdown();
+ httpclient.getConnectionManager().shutdown();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java Thu Oct 21 19:59:18 2010
@@ -85,7 +85,7 @@ public class ManagerConnectDirect {
HttpRequest req = new BasicHttpRequest("OPTIONS", "*", HttpVersion.HTTP_1_1);
req.addHeader("Host", target.getHostName());
-
+
HttpContext ctx = new BasicHttpContext();
System.out.println("preparing route to " + target);
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java Thu Oct 21 19:59:18 2010
@@ -105,7 +105,7 @@ public class ManagerConnectProxy {
String authority = target.getHostName() + ":" + target.getPort();
HttpRequest connect = new BasicHttpRequest("CONNECT", authority, HttpVersion.HTTP_1_1);
connect.addHeader("Host", authority);
-
+
System.out.println("opening tunnel to " + target);
conn.sendRequestHeader(connect);
// there is no request entity
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java Thu Oct 21 19:59:18 2010
@@ -77,7 +77,7 @@ public class OperatorConnectDirect {
HttpRequest req = new BasicHttpRequest("OPTIONS", "*", HttpVersion.HTTP_1_1);
req.addHeader("Host", target.getHostName());
-
+
HttpContext ctx = new BasicHttpContext();
OperatedClientConnection conn = scop.createConnection();
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java?rev=1026121&r1=1026120&r2=1026121&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java Thu Oct 21 19:59:18 2010
@@ -67,9 +67,9 @@ public class OperatorConnectProxy {
// Register the "http" and "https" protocol schemes, they are
// required by the default operator to look up socket factories.
SchemeRegistry supportedSchemes = new SchemeRegistry();
- supportedSchemes.register(new Scheme("http",
+ supportedSchemes.register(new Scheme("http",
80, PlainSocketFactory.getSocketFactory()));
- supportedSchemes.register(new Scheme("https",
+ supportedSchemes.register(new Scheme("https",
443, SSLSocketFactory.getSocketFactory()));
// Prepare parameters.
@@ -86,7 +86,7 @@ public class OperatorConnectProxy {
// In a real application, request interceptors should be used
// to add the required headers.
req.addHeader("Host", target.getHostName());
-
+
HttpContext ctx = new BasicHttpContext();
OperatedClientConnection conn = scop.createConnection();
@@ -97,7 +97,7 @@ public class OperatorConnectProxy {
// Creates a request to tunnel a connection.
// For details see RFC 2817, section 5.2
String authority = target.getHostName() + ":" + target.getPort();
- HttpRequest connect = new BasicHttpRequest("CONNECT", authority,
+ HttpRequest connect = new BasicHttpRequest("CONNECT", authority,
HttpVersion.HTTP_1_1);
// In a real application, request interceptors should be used
// to add the required headers.