diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:32:41 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:32:49 +0000 |
| commit | c81a19552f12a16591ae695fa1ef660f9e38730e (patch) | |
| tree | d596c070a5d8220515c91ebc9b54e6fec31e2d6e | |
| parent | Merge branch 'develop' into client_v2_sync (diff) | |
| download | synapse-c81a19552f12a16591ae695fa1ef660f9e38730e.tar.xz | |
Add ports back to demo/start.sh
| -rwxr-xr-x | demo/start.sh | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demo/start.sh b/demo/start.sh index a7502e7a8d..bb2248770d 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -16,7 +16,7 @@ if [ $# -eq 1 ]; then fi fi -for port in 8080; do +for port in 8080 8081 8082; do echo "Starting server on port $port... " https_port=$((port + 400)) diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 0c17208cd3..a0ab9839a6 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -80,7 +80,7 @@ class SyncRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request): - user = yield self.auth.get_user_by_req(request) + user, client = yield self.auth.get_user_by_req(request) timeout = self.parse_integer(request, "timeout", default=0) limit = self.parse_integer(request, "limit", required=True) |