summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-03-23 11:10:32 +0000
committerGitHub <noreply@github.com>2018-03-23 11:10:32 +0000
commitb7e7b52452493f0abc76b0e75bed7c6b594333ae (patch)
tree7c379c9bb712e64fe61b2de2d181e5780117ab54 /synapse/app/homeserver.py
parentMerge pull request #3006 from matrix-org/erikj/state_iter (diff)
parent404 correctly on missing paths via NoResource (diff)
downloadsynapse-b7e7b52452493f0abc76b0e75bed7c6b594333ae.tar.xz
Merge pull request #3022 from matrix-org/matthew/noresource
404 correctly on missing paths via NoResource
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 e477c7ced6..c00afbba28 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -56,7 +56,7 @@ from synapse.util.rlimit import change_resource_limit
 from synapse.util.versionstring import get_version_string
 from twisted.application import service
 from twisted.internet import defer, reactor
-from twisted.web.resource import EncodingResourceWrapper, Resource
+from twisted.web.resource import EncodingResourceWrapper, NoResource
 from twisted.web.server import GzipEncoderFactory
 from twisted.web.static import File
 
@@ -126,7 +126,7 @@ class SynapseHomeServer(HomeServer):
         if WEB_CLIENT_PREFIX in resources:
             root_resource = RootRedirect(WEB_CLIENT_PREFIX)
         else:
-            root_resource = Resource()
+            root_resource = NoResource()
 
         root_resource = create_resource_tree(resources, root_resource)