diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-07 09:37:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-07 09:37:38 +0100 |
| commit | dfc74c30c9a74f2f63f0870b0a951300a362d7d1 (patch) | |
| tree | 170afe65560fad6e2a4a7b38baf731d6753b8664 /synapse | |
| parent | Don't explode if we don't recognize one of the event_ids in the backfill request (diff) | |
| parent | Don't 500 if a group is missing from the regex (diff) | |
| download | synapse-dfc74c30c9a74f2f63f0870b0a951300a362d7d1.tar.xz | |
Merge pull request #197 from matrix-org/mjark/missing_regex_group
Don't 500 if a group is missing from the regex match
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/server.py | 2 |
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) |