[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.2.0-17-g703353d

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:10:22 CEST 2013


The branch, statusflag has been updated
       via  703353dd9fc0031109cf4af4d8b497efbf6013b1 (commit)
      from  adcedf70d52d663534be1dcbf2e4f837516cd42c (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 ++
 sbin/x2gobroker  |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8eb7e11..a78bfda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
       Thanks to Richard Weinberger for spotting this!!!
     - Handle URLs in plain WebUI that have slashes (and subpaths) in the
       backend name.
+    - In WSGI mode: only populate os.environ with variables matching
+      »X2GOBROKER_*«.
   * Provide init scripts and *.default files outside of /debian folder (as
     they are also relevant for non-Debian packaging).
 
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 63823b4..c88eb97 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -157,7 +157,9 @@ else:
             del environ['SCRIPT_NAME']
 
         # make sure the httpd server's environment is set as os.environ
-        os.environ = environ
+        for key in environ.keys():
+            if key.startswith('X2GOBROKER_'):
+                os.environ.update({ key: environ[key] })
         reload(x2gobroker.defaults)
 
         return _tornado_application(environ, start_response)


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