Author: astitcher
Date: Thu Jan 23 03:09:28 2014
New Revision: 1560575
URL: http://svn.apache.org/r1560575
Log:
QPID-5488: Allow for not enough bytes initially received by client for protocol init
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=1560575&r1=1560574&r2=1560575&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp Thu Jan 23 03:09:28 2014
@@ -359,8 +359,10 @@ size_t SslConnector::decode(const char*
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)){
Modified: qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp?rev=1560575&r1=1560574&r2=1560575&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp Thu Jan 23 03:09:28 2014
@@ -289,8 +289,10 @@ size_t TCPConnector::decode(const char*
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)){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
|