[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.6-16-g26629de
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:27 CEST 2013
The branch, build-main has been updated
via 26629de904cb2dc49f576d156efd6913ab7cccdd (commit)
from 9ffb7417721a1ca2ab19e48cca2a545c92a56e0e (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/extras.py | 2 +-
x2gobroker/web/html.py | 2 +-
x2gobroker/web/plain.py | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a640f0e..fb1facb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low
(Fixes: #132).
- Return some sane output to x2goclient if the / all configured X2Go
server(s) is/are down.
+ - Tornado: Use RequestHandler.set_header() instead of
+ RequestHandler.add_header().
* /debian/control:
+ Build-Depend on python-paste, python-nose (testsuite needs them).
diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py
index df48008..e1adf2a 100644
--- a/x2gobroker/web/extras.py
+++ b/x2gobroker/web/extras.py
@@ -40,7 +40,7 @@ class X2GoBrokerPubKeyService(tornado.web.RequestHandler):
def _gen_http_header(self):
for http_header_item in self.http_header_items.keys():
- self.add_header(http_header_item, self.http_header_items[http_header_item])
+ self.set_header(http_header_item, self.http_header_items[http_header_item])
def GET(self):
diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py
index a604239..fd76eb8 100644
--- a/x2gobroker/web/html.py
+++ b/x2gobroker/web/html.py
@@ -62,7 +62,7 @@ $output
def _gen_http_header(self):
for http_header_item in self.http_header_items.keys():
- self.add_header(http_header_item, self.http_header_items[http_header_item])
+ self.set_header(http_header_item, self.http_header_items[http_header_item])
def get(self, backend):
self._gen_http_header()
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index f85bc98..c4deb42 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -40,7 +40,7 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
def _gen_http_header(self):
for http_header_item in self.http_header_items.keys():
- self.add_header(http_header_item, self.http_header_items[http_header_item])
+ self.set_header(http_header_item, self.http_header_items[http_header_item])
def get(self, backend):
if x2gobroker.defaults.X2GOBROKER_DEBUG:
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