From 09027e7286974bf6b61f4106395da2623121db8d Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Tue, 11 Mar 2014 14:16:43 +0000 Subject: [PATCH] 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 --- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java index 6c059d1a9..81d6aa5bd 100644 --- a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -397,7 +397,9 @@ public Socket connectSocket( } 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); }