The branch, master has been updated via 8da942dc36a58af3aefc730ace7c7af91ad587c0 (commit) from 972d8cf6f428e3183beedbcaa9e4c6db1704cde1 (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 8da942dc36a58af3aefc730ace7c7af91ad587c0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jun 20 22:06:38 2011 +0200 Fix SSH proxy stop_thread on Windows. ----------------------------------------------------------------------- Summary of changes: x2go/forward.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/forward.py b/x2go/forward.py index e683904..75153f0 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -34,6 +34,7 @@ from gevent.server import StreamServer # Python X2go modules import log +import defaults.X2GOCLIENT_OS as _X2GOCLIENT_OS import x2go_exceptions class X2goFwServer(StreamServer): @@ -198,7 +199,8 @@ def stop_forward_tunnel(fw_server): """ if fw_server is not None: fw_server.keepalive = False - fw_server.close_channel() + if _X2GOCLIENT_OS != "Windows": + fw_server.close_channel() fw_server.stop() if __name__ == '__main__': hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).