Fixed a bug regarding the readSelect() timeout during handshake. My bad.

1 files changed, 3 insertions, 5 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index d1d39597c0c..acd736de782 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -90,13 +90,13 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::init(int timeout)
     {
         int i = 0;

 

-        _readTimeout = timeout;

+        _readTimeout = timeout > _handshakeReadTimeout ? timeout : _handshakeReadTimeout;

 

         try

         {

             if (_initWantRead)
             {
-                i = readSelect(timeout);
+                i = readSelect(_readTimeout);
             }
             else if (_initWantWrite)
             {
@@ -168,7 +168,7 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::init(int timeout)
 
                     if (wouldBlock())
                     {
-                        readSelect(timeout);
+                        readSelect(_readTimeout);
                         break;
                     }
 
@@ -216,8 +216,6 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::init(int timeout)
 
         if (retCode > 0)
         {
-            _readTimeout = timeout > _handshakeReadTimeout ? timeout : _handshakeReadTimeout;

-

             // Init finished, look at the connection information.
             showConnectionInfo();
         }