Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made PlainSocketFactory non-final; improved SSLSocketFactory#connectSocket() to accept plain sockets as input 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1036123 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2010-11-17 17:22:28 +00:00
parent b5340858b8
commit 023363e3ff
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
View File

@ -54,7 +54,7 @@ import org.apache.http.params.HttpParams;
*/
@SuppressWarnings("deprecation")
@Immutable
public final class PlainSocketFactory implements SocketFactory, SchemeSocketFactory {
public class PlainSocketFactory implements SocketFactory, SchemeSocketFactory {
/**
* The default factory.

32
httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@ -336,27 +336,23 @@ public class SSLSocketFactory implements LayeredSchemeSocketFactory, LayeredSock
/**
* @param params Optional parameters. Parameters passed to this method will have no effect.
* This method will create a unconnected instance of {@link Socket} class
* using {@link javax.net.ssl.SSLSocketFactory#createSocket()} method.
* This method will create a unconnected instance of {@link Socket} class.
* @since 4.1
*/
@SuppressWarnings("cast")
public Socket createSocket(final HttpParams params) throws IOException {
// the cast makes sure that the factory is working as expected
return (SSLSocket) this.socketfactory.createSocket();
return new Socket();
}
@SuppressWarnings("cast")
@Deprecated
public Socket createSocket() throws IOException {
// the cast makes sure that the factory is working as expected
return (SSLSocket) this.socketfactory.createSocket();
return new Socket();
}
/**
* @since 4.1
*/
public Socket connectSocket(
final Socket sock,
final Socket socket,
final InetSocketAddress remoteAddress,
final InetSocketAddress localAddress,
final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
@ -366,22 +362,30 @@ public class SSLSocketFactory implements LayeredSchemeSocketFactory, LayeredSock
if (params == null) {
throw new IllegalArgumentException("HTTP parameters may not be null");
}
SSLSocket sslsock = (SSLSocket) (sock != null ? sock : createSocket());
Socket sock = socket != null ? socket : new Socket();
if (localAddress != null) {
sslsock.setReuseAddress(HttpConnectionParams.getSoReuseaddr(params));
sslsock.bind(localAddress);
sock.setReuseAddress(HttpConnectionParams.getSoReuseaddr(params));
sock.bind(localAddress);
}
int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
int soTimeout = HttpConnectionParams.getSoTimeout(params);
try {
sslsock.connect(remoteAddress, connTimeout);
sock.connect(remoteAddress, connTimeout);
} catch (SocketTimeoutException ex) {
throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/"
+ remoteAddress.getAddress() + " timed out");
}
sslsock.setSoTimeout(soTimeout);
sock.setSoTimeout(soTimeout);
SSLSocket sslsock;
// Setup SSL layering if necessary
if (sock instanceof SSLSocket) {
sslsock = (SSLSocket) sock;
} else {
sslsock = (SSLSocket) this.socketfactory.createSocket(
sock, remoteAddress.getHostName(), remoteAddress.getPort(), true);
}
if (this.hostnameVerifier != null) {
try {
this.hostnameVerifier.verify(remoteAddress.getHostName(), sslsock);