diff options
Diffstat (limited to 'cpp/src/IceSSL/SslServerTransceiver.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SslServerTransceiver.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp index 4acbd506500..f34ba6744a8 100644 --- a/cpp/src/IceSSL/SslServerTransceiver.cpp +++ b/cpp/src/IceSSL/SslServerTransceiver.cpp @@ -175,8 +175,6 @@ IceSSL::SslServerTransceiver::handshake(int timeout) while(!retCode) { - _readTimeout = timeout > _handshakeReadTimeout ? timeout : _handshakeReadTimeout; - if(_initWantWrite) { int i = writeSelect(timeout); @@ -190,7 +188,7 @@ IceSSL::SslServerTransceiver::handshake(int timeout) } else { - int i = readSelect(_readTimeout); + int i = readSelect(timeout); if(i == 0) { @@ -265,7 +263,7 @@ IceSSL::SslServerTransceiver::handshake(int timeout) if(wouldBlock()) { - readSelect(_readTimeout); + readSelect(timeout); break; } @@ -363,8 +361,9 @@ IceSSL::SslServerTransceiver::showConnectionInfo() IceSSL::SslServerTransceiver::SslServerTransceiver(const OpenSSLPluginIPtr& plugin, SOCKET fd, const IceSSL::CertificateVerifierPtr& certVerifier, - SSL* sslConnection) : - SslTransceiver(plugin, fd, certVerifier, sslConnection) + SSL* sslConnection, + int timeout) : + SslTransceiver(plugin, fd, certVerifier, sslConnection, timeout) { // Set the Accept Connection state for this connection. SSL_set_accept_state(sslConnection); |