You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2014/01/23 16:46:39 UTC
svn commit: r1560716 - in /qpid/branches/0.26/qpid/cpp/src/qpid/client:
SslConnector.cpp TCPConnector.cpp
Author: astitcher
Date: Thu Jan 23 15:46:39 2014
New Revision: 1560716
URL: http://svn.apache.org/r1560716
Log:
QPID-5488: Allow for not enough bytes initially received by client for protocol init
>From trunk r1560575
Modified:
qpid/branches/0.26/qpid/cpp/src/qpid/client/SslConnector.cpp
qpid/branches/0.26/qpid/cpp/src/qpid/client/TCPConnector.cpp
Modified: qpid/branches/0.26/qpid/cpp/src/qpid/client/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=1560716&r1=1560715&r2=1560716&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/src/qpid/client/SslConnector.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/src/qpid/client/SslConnector.cpp Thu Jan 23 15:46:39 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/branches/0.26/qpid/cpp/src/qpid/client/TCPConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/src/qpid/client/TCPConnector.cpp?rev=1560716&r1=1560715&r2=1560716&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/src/qpid/client/TCPConnector.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/src/qpid/client/TCPConnector.cpp Thu Jan 23 15:46:39 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