The branch, master has been updated via 286a07f1b2fa5f9045ef2d36caec91a897945971 (commit) via 0cebec3a37eb7351bccee8d25afd09bc2a40f398 (commit) via bec5751cd01a29fa3fbfeb3b684aceaea41097a3 (commit) via fce791081c835af97b66ffbc0acc4e911c7e38b6 (commit) from eeb221276d5cd8cc7e829c4d28ae2d5659a7e190 (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 286a07f1b2fa5f9045ef2d36caec91a897945971 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 23 10:47:32 2011 +0200 changelog cleanup commit 0cebec3a37eb7351bccee8d25afd09bc2a40f398 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 23 10:44:59 2011 +0200 Use TCP_NODELAY socket option for graphics forwarding tunnels. commit bec5751cd01a29fa3fbfeb3b684aceaea41097a3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 23 10:44:25 2011 +0200 changelog fix commit fce791081c835af97b66ffbc0acc4e911c7e38b6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 20 12:41:55 2011 +0200 comment fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2go/backends/proxy/base.py | 2 +- x2go/forward.py | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c2648a..5432c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,8 @@ python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low - Differentiate between spool folders and data folders when unsharing all folders, return exitcode from X2goTerminalSessionSTDOUT.unshare_* methods. - - Use TCP_NODELAY option for audio rev forwarding tunnels. + - Use TCP_NODELAY socket option for audio rev forwarding tunnels. + - Use TCP_NODELAY socket option for graphics forwarding tunnels. [ Dick Kniep ] * Fix for upstream version 0.1.1.7: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index ee984e6..90b56b2 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -242,7 +242,7 @@ class X2goProxyBASE(threading.Thread): the parent class method X2goProxyBASE.process_proxy_options() """ - # do the logging of remaining options, call + # do the logging of remaining options if self.proxy_options: self.logger('ignoring non-processed proxy options: %s' % self.proxy_options, loglevel=log.loglevel_INFO) diff --git a/x2go/forward.py b/x2go/forward.py index 161a49e..a9b5894 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -94,6 +94,9 @@ class X2goFwServer(StreamServer): """ self.fw_socket = fw_socket + # disable Nagle algorithm in TCP/IP protocol + self.fw_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + _success = False _count = 0 _maxwait = 20 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).