Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-06 11:14:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests

Browse source
This commit is contained in:
Erik Johnston 2015-02-11 16:12:59 +00:00
commit 41a9a76a99
33 changed files with 353 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/http/server.py
View file

@ -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