[X2Go-Commits] [python-x2go] 02/02: Catch EOFError in x2go_forward_tunnel_handle().

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit b7b43de1f7b7059a76ef3dc4f6373b7a633d9a0e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 9 09:42:52 2014 +0100

    Catch EOFError in x2go_forward_tunnel_handle().
---
 debian/changelog |    1 +
 x2go/forward.py  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0ff8131..d197cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium
 
   * New upstream version (0.5.0.3):
     - Fix catching control session exceptions in X2GoSession class.
+    - Catch EOFError in x2go_forward_tunnel_handle().
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 13:15:44 +0100
 
diff --git a/x2go/forward.py b/x2go/forward.py
index b633a50..c633661 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -167,7 +167,7 @@ class X2GoFwServer(StreamServer):
                         fw_socket.send(data)
                 self.close_channel()
                 self.close_socket()
-            except socket.error:
+            except (socket.error, EOFError):
                 pass
 
             self.logger('Tunnel closed from %r' % (chan_peername,),

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git