[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: d1fd5894edf0638ea24df5c6fd30e20054d9b30c

[X2Go dev team]

The branch, twofactorauth has been updated
       via  d1fd5894edf0638ea24df5c6fd30e20054d9b30c (commit)
      from  d15600aa6fd3ccbc2958b1e841643d7d4c7aea01 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/proxy/base.py      |    9 ++++++---
 x2go/backends/terminal/stdout.py |    4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index b6764c6..91580dc 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -171,8 +171,10 @@ class X2goProxyBASE(threading.Thread):
         self.logger('forking threaded subprocess: %s' % " ".join(cmd_line), log.loglevel_DEBUG)
 
         _stdin = None
+        _shell = False
         if _X2GOCLIENT_OS == 'Windows':
             _stdin = file('nul', 'r')
+            _shell = True
 
         while not self.proxy:
             gevent.sleep(.2)
@@ -181,15 +183,16 @@ class X2goProxyBASE(threading.Thread):
                                               stdin=_stdin,
                                               stdout=self.session_log_stdout,
                                               stderr=self.session_log_stderr,
-                                              shell=True)
-            
+                                              shell=_shell)
+
         while self._keepalive:
             gevent.sleep(.5)
 
         if _X2GOCLIENT_OS == 'Windows':
             p.stdin.close()
+        print 'TERMINATING PROXY'
+        p.terminate()
 
-        
     def _update_local_proxy_socket(self, port):
         pass
 
diff --git a/x2go/backends/terminal/stdout.py b/x2go/backends/terminal/stdout.py
index deb5ba5..679c83c 100644
--- a/x2go/backends/terminal/stdout.py
+++ b/x2go/backends/terminal/stdout.py
@@ -720,6 +720,8 @@ class X2goTerminalSessionSTDOUT(object):
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command("x2gosuspend-session %s" % self.session_info, loglevel=log.loglevel_DEBUG)
         dummy_stdout = stdout.read()
         dummy_stderr = stderr.read()
+        self.proxy.__del__()
+
         # TODO: check if session has really suspended
         _ret = True
 
@@ -737,6 +739,8 @@ class X2goTerminalSessionSTDOUT(object):
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command("x2goterminate-session %s" % self.session_info, loglevel=log.loglevel_DEBUG)
         dummy_stdout = stdout.read()
         dummy_stderr = stderr.read()
+        self.proxy.__del__()
+
         # TODO: check if session has really suspended
         _ret = True
 


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).