summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-08 15:37:33 +0100
committerErik Johnston <erik@matrix.org>2015-07-08 15:37:33 +0100
commit304343f4d7502d65ff7977df466209ef4702b90c (patch)
tree0eb1002013d40ef65dcd82e630859c467b3e6ec7 /synapse/http
parentAdd a cache to fetching of receipt streams (diff)
parentMerge pull request #197 from matrix-org/mjark/missing_regex_group (diff)
downloadsynapse-304343f4d7502d65ff7977df466209ef4702b90c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/http')
-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)