[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r1626784 - /httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache
From:       olegk () apache ! org
Date:       2014-09-22 14:13:35
Message-ID: 20140922141335.5B7AB2388993 () eris ! apache ! org
[Download RAW message or body]

Author: olegk
Date: Mon Sep 22 14:13:34 2014
New Revision: 1626784

URL: http://svn.apache.org/r1626784
Log:
Use non-zero connect timeout as SSL handshake handshake (socket) timeout if not \
explicitly set by the caller (socket timeout is zero)

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


Modified: httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
                
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.3.x/httpclient/ \
src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1626784&r1=1626783&r2=1626784&view=diff
 ==============================================================================
--- httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java \
                (original)
+++ httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java \
Mon Sep 22 14:13:34 2014 @@ -236,6 +236,9 @@ public class SSLConnectionSocketFactory 
             sock.bind(localAddress);
         }
         try {
+            if (connectTimeout > 0 && sock.getSoTimeout() == 0) {
+                sock.setSoTimeout(connectTimeout);
+            }
             sock.connect(remoteAddress, connectTimeout);
         } catch (final IOException ex) {
             try {


[prev in list] [next in list] [prev in thread] [next in thread]