summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-12-20 01:37:50 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2016-12-20 01:37:50 +0100
commit702c020e58dd8663e66c25f88fba2a02264e7357 (patch)
treeb272f062a4e843423495973d286bd003fe07f061 /synapse/app/homeserver.py
parentMerge pull request #1711 from matrix-org/matthew/utf8-password-change (diff)
downloadsynapse-702c020e58dd8663e66c25f88fba2a02264e7357.tar.xz
Fix check for bind_address
The empty string is a valid setting for the bind_address option, so
explicitly check for None here instead.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2d6becad1a..6c69ccd7e2 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -175,7 +175,7 @@ class SynapseHomeServer(HomeServer):
 
         root_resource = create_resource_tree(resources, root_resource)
 
-        if bind_address:
+        if bind_address is not None:
             bind_addresses.append(bind_address)
 
         if tls:
@@ -215,7 +215,7 @@ class SynapseHomeServer(HomeServer):
                 bind_address = listener.get("bind_address", None)
                 bind_addresses = listener.get("bind_addresses", [])
 
-                if bind_address:
+                if bind_address is not None:
                     bind_addresses.append(bind_address)
 
                 for address in bind_addresses: