Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2014-09-03 09:46:39 +01:00
commit ddc16d8642
7 changed files with 69 additions and 6 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server.
"""
__version__ = "0.1.2"
__version__ = "0.2.0"

View file

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