The branch, build-main has been updated via 620cf778695448fb38394e5b476974aa1815c639 (commit) from cc0ae3ddb38a1212ab5e63715344e7befdc4b544 (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 | 1 + x2gobroker/web/plain.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d452a2..58fad73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gobroker (0.0.0.6-0~x2go1) UNRELEASED; urgency=low runs as super-user root). - Switch from webpy to using tornado as http engine. - Divert tornado log requests into the broker's logger instances. + - Add workaround to handle bug #138 in x2goclient. * /debian/*.default: - Be more explanatory about the X2GOBROKER_DEBUG option and allow to enable debug mode for the different services independently. diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 006a539..f85bc98 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -21,8 +21,9 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # modules -import tornado.web import types +import tornado.web +from tornado.escape import native_str, parse_qs_bytes # Python X2Go Broker modules import x2gobroker.defaults @@ -66,6 +67,12 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): if not broker_backend.is_enabled(): raise tornado.web.HTTPError(404) + # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138) + content_type = self.request.headers.get("Content-Type", "") + if not content_type.startswith("application/x-www-form-urlencoded"): + for name, values in parse_qs_bytes(native_str(self.request.body)).iteritems(): + self.request.arguments.setdefault(name, []).extend(values) + # set the client address for the broker backend ip = self.request.remote_ip if ip: 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).