summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-03 09:46:39 +0100
committerErik Johnston <erik@matrix.org>2014-09-03 09:46:39 +0100
commitddc16d8642b92972b9bfb7d47d2a0f415fd326bf (patch)
tree5a29e291a75dd1b33299b2269850dc9e16ac6fca /synapse
parentAdd ban support: /rooms/$roomid/ban with { user_id : foo } (diff)
parentAdd database upgrade script (diff)
downloadsynapse-ddc16d8642b92972b9bfb7d47d2a0f415fd326bf.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/http/endpoint.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 04200060bf..b45cf47b56 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"
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(