diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-01-23 03:09:28 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-01-23 03:09:28 +0000 |
| commit | ac51ca3f2be3df75c54eae14a50dc2e3d758b693 (patch) | |
| tree | 24ddbf66c7c5c6c4baac1ebf90774e5731da60dd /qpid/cpp/src | |
| parent | 71500ddb2ca73e445ba1ed5c8bd242cf85568a16 (diff) | |
| download | qpid-python-ac51ca3f2be3df75c54eae14a50dc2e3d758b693.tar.gz | |
QPID-5488: Allow for not enough bytes initially received by client for protocol init
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560575 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/client/SslConnector.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/client/TCPConnector.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp index 2e8842f24b..b292c0e6d6 100644 --- a/qpid/cpp/src/qpid/client/SslConnector.cpp +++ b/qpid/cpp/src/qpid/client/SslConnector.cpp @@ -359,8 +359,10 @@ size_t SslConnector::decode(const char* buffer, size_t size) throw Exception(QPID_MSG("Unsupported version: " << protocolInit << " supported version " << version)); } + initiated = true; + } else { + return size - in.available(); } - initiated = true; } AMQFrame frame; while(frame.decode(in)){ diff --git a/qpid/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp index 2bdeec5b47..02f820fe03 100644 --- a/qpid/cpp/src/qpid/client/TCPConnector.cpp +++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp @@ -289,8 +289,10 @@ size_t TCPConnector::decode(const char* buffer, size_t size) throw Exception(QPID_MSG("Unsupported version: " << protocolInit << " supported version " << version)); } + initiated = true; + } else { + return size - in.available(); } - initiated = true; } AMQFrame frame; while(frame.decode(in)){ |