diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-01-21 21:31:47 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-01-21 21:31:47 +0000 |
| commit | 79709013d412fdc3c341415e510037945ef0b7b0 (patch) | |
| tree | e45ee28f3c758d339c9d2cc33f1c6896f8d45132 /cpp/src/Ice/SslConnectionOpenSSL.cpp | |
| parent | Fixed memory leak in SslConfig.cpp. (diff) | |
| download | ice-79709013d412fdc3c341415e510037945ef0b7b0.tar.bz2 ice-79709013d412fdc3c341415e510037945ef0b7b0.tar.xz ice-79709013d412fdc3c341415e510037945ef0b7b0.zip | |
Fixed (I believe) the spin bug.
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSL.cpp')
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSL.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp index 1502e6d2d5b..5806b0f660d 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp @@ -51,8 +51,6 @@ IceSecurity::Ssl::OpenSSL::Connection::Connection(SSL* sslConnection, string& sy _initWantRead = 0; _initWantWrite = 0; - _timeoutEncountered = false; - // None configured, default to indicated timeout _handshakeReadTimeout = 0; } @@ -75,7 +73,7 @@ IceSecurity::Ssl::OpenSSL::Connection::~Connection() void IceSecurity::Ssl::OpenSSL::Connection::shutdown() { - ICE_METHOD_INV("OpenSSL::Connection::shutdown()"); + ICE_METHOD_INV("OpenSSL::Connection::shutdown()");
if (_sslConnection != 0) { @@ -400,7 +398,6 @@ IceSecurity::Ssl::OpenSSL::Connection::readSelect(int timeout) if (ret == 0) { ICE_DEV_DEBUG("Connection::readSelect(): Throwing TimeoutException... SslConnectionOpenSSL.cpp, 333"); - _timeoutEncountered = true; throw TimeoutException(__FILE__, __LINE__); } @@ -464,7 +461,7 @@ IceSecurity::Ssl::OpenSSL::Connection::writeSelect(int timeout) int IceSecurity::Ssl::OpenSSL::Connection::readSSL(Buffer& buf, int timeout) { - ICE_METHOD_INV("OpenSSL::Connection::readSSL()"); + ICE_METHOD_INV("OpenSSL::Connection::readSSL()");
int packetSize = buf.b.end() - buf.i; int totalBytesRead = 0; @@ -479,7 +476,6 @@ IceSecurity::Ssl::OpenSSL::Connection::readSSL(Buffer& buf, int timeout) // Ensure we're initialized. initReturn = initialize(timeout); -///// if (initReturn == -1) { // Handshake underway, timeout immediately, easy way to deal with this. @@ -491,7 +487,6 @@ IceSecurity::Ssl::OpenSSL::Connection::readSSL(Buffer& buf, int timeout) // Retry the initialize call continue; } -///// // initReturn must be > 0, so we're okay to try a write |