Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management

2015-07-06 18:48:27 +01:00 · 2015-07-06 18:48:27 +01:00 · 28ef344077
parent 2ef182ee93 a7dcbfe430
commit 28ef344077
1 changed files with 1 additions and 1 deletions
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@ -207,7 +207,7 @@ class JsonResource(HttpServer, resource.Resource):
            incoming_requests_counter.inc(request.method, servlet_classname)

            args = [
-                urllib.unquote(u).decode("UTF-8") for u in m.groups()
+                urllib.unquote(u).decode("UTF-8") if u else u for u in m.groups()
            ]

            callback_return = yield callback(request, *args)