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

[X2Go dev team]

The branch, twofactorauth has been updated
       via  d15600aa6fd3ccbc2958b1e841643d7d4c7aea01 (commit)
      from  8384119b95078448cfc51ae08f264eeb34b96922 (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 |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index c485de5..b6764c6 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -170,21 +170,26 @@ class X2goProxyBASE(threading.Thread):
         self.session_log_stderr = open('%s/%s' % (self.session_info.local_container, self.session_log, ), 'a')
         self.logger('forking threaded subprocess: %s' % " ".join(cmd_line), log.loglevel_DEBUG)
 
-        _dummy_stdin = cStringIO.StringIO()
+        _stdin = None
+        if _X2GOCLIENT_OS == 'Windows':
+            _stdin = file('nul', 'r')
+
         while not self.proxy:
             gevent.sleep(.2)
             p = self.proxy = subprocess.Popen(cmd_line,
                                               env=self.PROXY_ENV,
-                                              stdin=_dummy_stdin,
+                                              stdin=_stdin,
                                               stdout=self.session_log_stdout,
                                               stderr=self.session_log_stderr,
-                                              shell=False)
-
+                                              shell=True)
+            
         while self._keepalive:
             gevent.sleep(.5)
 
-        p.stdin.close()
+        if _X2GOCLIENT_OS == 'Windows':
+            p.stdin.close()
 
+        
     def _update_local_proxy_socket(self, port):
         pass
 


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