[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.2.0-16-gadcedf7

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:47 CEST 2013


The branch, build-main has been updated
       via  adcedf70d52d663534be1dcbf2e4f837516cd42c (commit)
      from  6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d (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:
 debian/changelog        |    2 ++
 x2gobroker/web/plain.py |    2 ++
 2 files changed, 4 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 448093d..8eb7e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
     - Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to
       x2gobroker-agent.pl during build via defining a macro in the Makefile.
       Thanks to Richard Weinberger for spotting this!!!
+    - Handle URLs in plain WebUI that have slashes (and subpaths) in the
+      backend name.
   * Provide init scripts and *.default files outside of /debian folder (as
     they are also relevant for non-Debian packaging).
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index ca041df..0607bf2 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -56,6 +56,8 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
             backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND
         else:
             backend = backend.rstrip('/')
+            if '/' in backend:
+                backend = backend.split('/')[0]
 
         # silence pyflakes...
         broker_backend = None


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




More information about the x2go-commits mailing list