[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-60-gb421552

[X2Go dev team]

The branch, master has been updated
       via  b421552475f78cfc2a954ac8368d05eb112fe3aa (commit)
      from  ca61624002de349c4b20f3217383066f7bd8b9d8 (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 b421552475f78cfc2a954ac8368d05eb112fe3aa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 4 11:00:24 2013 +0100

    WSGI implementation: keep SCRIPT_NAME in environ, as removing it causes AssertionErrors whenever we trigger a tornado.web.HTTPError.

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

Summary of changes:
 bin/x2gobroker   |    7 +++++--
 debian/changelog |    2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index b9c7ec7..e37a5ee 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -220,9 +220,12 @@ else:
 
     def _application(environ, start_response):
 
+        ### FIXME: the code below causes AssertionErrors whenever we trigger a
+        ###        tornado.web.HTTPError. Commenting out for now, may be removed
+        ###        later.
         # some WSGI implementations do not like the SCRIPT_NAME env var
-        if 'SCRIPT_NAME' in environ:
-            del environ['SCRIPT_NAME']
+        #if 'SCRIPT_NAME' in environ:
+        #    del environ['SCRIPT_NAME']
 
         # make sure the httpd server's environment is set as os.environ
         for key in environ.keys():
diff --git a/debian/changelog b/debian/changelog
index d0ecb8c..b17af94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
       authorized_keys file location in SSH server daemon. Thanks to Stefan
       Heitmüller for pointing out more recent SSH server's configuration
       style.
+    - WSGI implementation: keep SCRIPT_NAME in environ, as removing it causes
+      AssertionErrors whenever we trigger a tornado.web.HTTPError.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi.


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