diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
commit | ddc16d8642b92972b9bfb7d47d2a0f415fd326bf (patch) | |
tree | 5a29e291a75dd1b33299b2269850dc9e16ac6fca /synapse/http | |
parent | Add ban support: /rooms/$roomid/ban with { user_id : foo } (diff) | |
parent | Add database upgrade script (diff) | |
download | synapse-ddc16d8642b92972b9bfb7d47d2a0f415fd326bf.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/http')
-rw-r--r-- | synapse/http/endpoint.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index a6ebe23567..6c1fdcb853 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -50,11 +50,11 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None, if ssl_context_factory is None: transport_endpoint = TCP4ClientEndpoint - default_port = 8080 + default_port = 8008 else: transport_endpoint = SSL4ClientEndpoint endpoint_kw_args.update(sslContextFactory=ssl_context_factory) - default_port = 443 + default_port = 8448 if port is None: return SRVClientEndpoint( |