diff options
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSLServer.cpp')
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSLServer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp index f2244f85455..40991e654ae 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp @@ -95,13 +95,13 @@ IceSecurity::Ssl::OpenSSL::ServerConnection::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)
{
@@ -198,7 +198,7 @@ IceSecurity::Ssl::OpenSSL::ServerConnection::init(int timeout) if (wouldBlock()) { - readSelect(timeout); + readSelect(_readTimeout); break; } @@ -246,8 +246,6 @@ IceSecurity::Ssl::OpenSSL::ServerConnection::init(int timeout) if (retCode > 0) { - _readTimeout = timeout > _handshakeReadTimeout ? timeout : _handshakeReadTimeout;
-
// Init finished, look at the connection information. showConnectionInfo(); } |