diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-21 11:16:00 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-21 11:16:00 +0200 |
| commit | 6a50ea5b6b2869925172a68bd3337f2f6832b8b5 (patch) | |
| tree | 1c95012fcb155dbf92def98ed6a3c0280cc325b3 /cpp/src/IceSSL/TransceiverI.cpp | |
| parent | ICE-5316 added pos method to BasicStream that works for both read/write (diff) | |
| download | ice-6a50ea5b6b2869925172a68bd3337f2f6832b8b5.tar.bz2 ice-6a50ea5b6b2869925172a68bd3337f2f6832b8b5.tar.xz ice-6a50ea5b6b2869925172a68bd3337f2f6832b8b5.zip | |
Fixed race condition which could cause request to be dispatched even if the connection was just put on hold
Diffstat (limited to 'cpp/src/IceSSL/TransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/TransceiverI.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp index 597faa8e923..3fde67ef906 100644 --- a/cpp/src/IceSSL/TransceiverI.cpp +++ b/cpp/src/IceSSL/TransceiverI.cpp @@ -622,6 +622,13 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf) IceInternal::SocketOperation IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool&) { + // + // Note: we don't set the hasMoreData flag in this implementation. + // We assume that OpenSSL doesn't read more SSL records than + // necessary to fill the requested data and that the sender sends + // Ice messages in individual SSL records. + // + if(_state == StateProxyConnectRequestPending) { // |