summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-07-06 18:48:27 +0100
committerMark Haines <mark.haines@matrix.org>2015-07-06 18:48:27 +0100
commit28ef3440772794d009bb168c400c63fc53515f1a (patch)
tree610090e8bfb3c1e6b61579d756a484ee6d895107 /synapse
parentAdd client API for uploading and querying keys for end to end encryption (diff)
parentDon't 500 if a group is missing from the regex (diff)
downloadsynapse-28ef3440772794d009bb168c400c63fc53515f1a.tar.xz
Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management
Diffstat (limited to 'synapse')
-rw-r--r--synapse/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 807ff95c65..b60e905a62 100644
--- 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)