[X2go-Commits] python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-10-g40c62d9

[X2go dev team]

The branch, release/0.1.1.x has been updated
       via  40c62d9845b7933a16d078272c30ec67273e2f13 (commit)
       via  d099f64c325f4a1971187bf681b40535063e023c (commit)
       via  343da76cc8807349013c715ab42cdac64ff0b952 (commit)
      from  3b26a3812c88d578e75e0d15e372bccc5e4e1f49 (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 40c62d9845b7933a16d078272c30ec67273e2f13
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 23 10:44:59 2011 +0200

    Use TCP_NODELAY socket option for graphics forwarding tunnels.

commit d099f64c325f4a1971187bf681b40535063e023c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 23 10:44:25 2011 +0200

    changelog fix

commit 343da76cc8807349013c715ab42cdac64ff0b952
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 20 12:41:55 2011 +0200

    comment fix

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |   11 +++++++++--
 x2go/backends/proxy/base.py |    2 +-
 x2go/forward.py             |    3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 59f1692..2bc1c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-python-x2go (0.1.1.7-0~x2go1) UNRELEASED; urgency=low
+python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
+
+  * License change upstream: GPLv3+ -> AGPLv3+
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 18 Jul 2011 13:51:09 +0200
+
+python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low
 
   [ Mike Gabriel ]
   * New upstream version (0.1.1.7), bugfix release for 0.1.1.x series:
@@ -6,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 9558b83..da12d6a 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 f87e964..b6d0947 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).