The branch, master has been updated via b3c10d7e36590aaa5b1de35313c6e2bbdadb5018 (commit) via 1b7296655b69600342ad40a60fcb112409eedf20 (commit) from b47d8fe5206d5d4c0cbf77238462f0044cc4357e (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 b3c10d7e36590aaa5b1de35313c6e2bbdadb5018 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 3 10:02:17 2012 +0100 X2Go Client uses the POST method, not the GET method commit 1b7296655b69600342ad40a60fcb112409eedf20 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 3 10:01:29 2012 +0100 catch socket.error exceptions when starting web.py ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 10 +++++++--- x2gobroker/web/html.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index b5f3b48..0a67c34 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -24,6 +24,7 @@ import sys import os import web import argparse +import socket try: import x2gobroker @@ -74,6 +75,9 @@ if __name__ == "__main__": sys.argv.append('') sys.argv[1] = cmdline_args.bind sys.argv[2:] = [] - app = web.application(urls, globals()) - app.internalerror = web.debugerror - app.run() + try: + app = web.application(urls, globals()) + app.internalerror = web.debugerror + app.run() + except socket.error, e: + print (e) diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index 48124e8..b3b3ce2 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -60,7 +60,7 @@ $output for http_header_item in self.http_header_items.keys(): web.header(http_header_item, self.http_header_items[http_header_item]) - def GET(self, backend): + def POST(self, backend): if not backend: backend = 'zeroconf' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).