mirror of
https://github.com/apache/httpcomponents-client.git
synced 2025-02-17 07:26:47 +00:00
HTTPCLIENT-718: SSL verification occurs before setSoTimeout, which can lead to hangs
git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@604462 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2370dc5fd3
commit
f696e1f684
@ -289,9 +289,11 @@ public Socket connectSocket(
|
||||
sslock.bind(isa);
|
||||
}
|
||||
|
||||
int timeout = HttpConnectionParams.getConnectionTimeout(params);
|
||||
sslock.connect(target, timeout);
|
||||
int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
|
||||
int soTimeout = HttpConnectionParams.getSoTimeout(params);
|
||||
|
||||
sslock.connect(target, connTimeout);
|
||||
sslock.setSoTimeout(soTimeout);
|
||||
try {
|
||||
hostnameVerifier.verify(host, sslock);
|
||||
// verifyHostName() didn't blowup - good!
|
||||
|
Loading…
x
Reference in New Issue
Block a user