The branch, master has been updated via 33c85f1f71c4272f98ef8377122a8b4fcd1537c6 (commit) from 9b101cdb548e24c1ef85317ff1e0d828c22cf881 (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 ----------------------------------------------------------------- commit 33c85f1f71c4272f98ef8377122a8b4fcd1537c6 Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Date: Fri Sep 30 15:05:57 2011 +0200 New upstream version ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 4 ++++ Proxy.cpp | 17 +++++++++++++++++ debian/changelog | 7 +++++++ 3 files changed, 28 insertions(+), 0 deletions(-) mode change 100755 => 100644 debian/rules The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index df10c85..b7ef0d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ ChangeLog: +nxcomp-3.5.0-2 + +- Fixed TR11H02398. Solved a race condition when creating channels. + nxcomp-3.5.0-1 - Opened the 3.5.0 branch based on nxcomp-3.4.0-7. diff --git a/Proxy.cpp b/Proxy.cpp index f88259f..3b4df7e 100644 --- a/Proxy.cpp +++ b/Proxy.cpp @@ -1626,6 +1626,23 @@ int Proxy::handleControlFromProxy(const unsigned char *message) int channelId = *(message + 2); // + // Check if the channel has been dropped. + // + + if (channels_[channelId] != NULL && + (channels_[channelId] -> getDrop() == 1 || + channels_[channelId] -> getClosing() == 1)) + { + #ifdef TEST + *logofs << "Proxy: Dropping the descriptor FD#" + << getFd(channelId) << " channel ID#" + << channelId << ".\n" << logofs_flush; + #endif + + handleDrop(channelId); + } + + // // Check if the channel is in the valid // range. // diff --git a/debian/changelog b/debian/changelog index c655982..d74b58e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nxcomp (3.5.0-2-0~x2go1) UNRELEASED; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version + + -- Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Fri, 30 Sep 2011 15:02:59 +0200 + nxcomp (3.5.0-1-0~x2go2) unstable; urgency=low [ Reinhard Tartler ] diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).