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

HTTPCLIENT-1478: deprecated SSLSocketFactory ignores socket timeout parameter during SSL handshake 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1576362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-03-11 14:16:43 +00:00
parent 3220bbf633
commit 09027e7286
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@ -397,7 +397,9 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
} else {
host = new HttpHost(remoteAddress.getHostName(), remoteAddress.getPort(), "https");
}
final int socketTimeout = HttpConnectionParams.getSoTimeout(params);
final int connectTimeout = HttpConnectionParams.getConnectionTimeout(params);
socket.setSoTimeout(socketTimeout);
return connectSocket(connectTimeout, socket, host, remoteAddress, localAddress, null);
}