summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/http/server.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 012425fa60..8fe8df4edb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.6.1d" +__version__ = "0.6.1f" 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