hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1576361 - /httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
Date Tue, 11 Mar 2014 14:16:10 GMT
Author: olegk
Date: Tue Mar 11 14:16:10 2014
New Revision: 1576361

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

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

Modified: httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1576361&r1=1576360&r2=1576361&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
(original)
+++ httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
Tue Mar 11 14:16:10 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);
     }
 



Mime
View raw message