This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d5624a40f2c99a4beb27e5914c2fa9cecce259c9 (commit)
via 01c42155cca188901214abbbf79317f853fe164d (commit)
from 08ce62bee5bee6805fbb01c1821c438028e858dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5624a40f2c99a4beb27e5914c2fa9cecce259c9
commit d5624a40f2c99a4beb27e5914c2fa9cecce259c9
Merge: 08ce62b 01c4215
Author: Brad King <[email protected]>
AuthorDate: Mon Nov 20 15:23:38 2017 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Mon Nov 20 10:23:48 2017 -0500
Merge topic 'fix-cmake-server-bad-buffering'
01c42155 server: Fix regression in partial message handling
Acked-by: Kitware Robot <[email protected]>
Reviewed-by: jdavidberger <[email protected]>
Merge-request: !1498
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01c42155cca188901214abbbf79317f853fe164d
commit 01c42155cca188901214abbbf79317f853fe164d
Author: vector-of-bool <[email protected]>
AuthorDate: Fri Nov 17 19:57:16 2017 -0700
Commit: Brad King <[email protected]>
CommitDate: Mon Nov 20 09:25:20 2017 -0500
server: Fix regression in partial message handling
If a partial message is flushed into the input pipe for CMake Server,
the parser will try and parse it as a full message because of some bad
loop checks. This was introduced accidentally in commit
v3.10.0-rc1~365^2~2 (server: Refactor to make the event loop owned by
server object, 2017-03-24).
diff --git a/Source/cmConnection.cxx b/Source/cmConnection.cxx
index f482412..28ba12c 100644
--- a/Source/cmConnection.cxx
+++ b/Source/cmConnection.cxx
@@ -97,11 +97,10 @@ void cmEventBasedConnection::ReadData(const std::string&
data)
this->RawReadBuffer += data;
if (BufferStrategy) {
std::string packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
- do {
+ while (!packet.empty()) {
ProcessRequest(packet);
packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
- } while (!packet.empty());
-
+ }
} else {
ProcessRequest(this->RawReadBuffer);
this->RawReadBuffer.clear();
-----------------------------------------------------------------------
Summary of changes:
Source/cmConnection.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
