diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
| commit | f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4 (patch) | |
| tree | 96cfd120f7bdb70c1045a8080f4f97f3a30bd574 /synapse/http | |
| parent | Minor tweaks based on PR feedback. (diff) | |
| parent | Merge branch 'bugs/SYN-264' into develop (diff) | |
| download | synapse-f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 6d084fa33c..589c30c199 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -113,6 +113,7 @@ class JsonResource(HttpServer, resource.Resource): path. """ code = None + start = self.clock.time_msec() try: # Just say yes to OPTIONS. if request.method == "OPTIONS": @@ -137,8 +138,6 @@ class JsonResource(HttpServer, resource.Resource): request.method, request.path ) - start = self.clock.time_msec() - code, response = yield path_entry.callback( request, *args |