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 2014/03/11 15:16:43 UTC

svn commit: r1576362 - /httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java

Author: olegk
Date: Tue Mar 11 14:16:43 2014
New Revision: 1576362

URL: http://svn.apache.org/r1576362
Log:
HTTPCLIENT-1478: deprecated SSLSocketFactory ignores socket timeout parameter during SSL handshake

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1576362&r1=1576361&r2=1576362&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java Tue Mar 11 14:16:43 2014
@@ -397,7 +397,9 @@ public class SSLSocketFactory implements
         } 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);
     }