diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceSSL/SChannelTransceiverI.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportTransceiverI.cpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp index eea97189df1..ec9562d4153 100644 --- a/cpp/src/IceSSL/SChannelTransceiverI.cpp +++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp @@ -384,7 +384,11 @@ SChannel::TransceiverI::sslHandshake() } // - // Check if the requested capabilities are met + // Check if the requested capabilities are met. + // + // NOTE: it's important for _ctxFlags to be a data member. The context flags might not be checked immediately + // if the last write can't complete without blocking above. In such a case, the context flags are checked here + // only once the sslHandshake is called again after the write completes. // if(flags != _ctxFlags) { diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp index 739e218a91a..7d33252b749 100644 --- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp @@ -221,7 +221,6 @@ IceSSL::SecureTransport::TransceiverI::initialize(IceInternal::Buffer& readBuffe _maxRecvPacketSize = 128 * 1024; // 128KB } - OSStatus err = 0; if(!_ssl) { |