Commit c8b7e7ea authored by Richard van der Hoff's avatar Richard van der Hoff

Refresh patches for 0.33.9

just context changes
parent 60f0c189
......@@ -2,7 +2,7 @@ Index: package-synapse-debian/synapse/handlers/auth.py
===================================================================
--- package-synapse-debian.orig/synapse/handlers/auth.py
+++ package-synapse-debian/synapse/handlers/auth.py
@@ -904,10 +904,10 @@ class AuthHandler(BaseHandler):
@@ -921,10 +921,10 @@ class AuthHandler(BaseHandler):
# Normalise the Unicode in the password
pw = unicodedata.normalize("NFKC", password)
......@@ -26,5 +26,5 @@ Index: package-synapse-debian/synapse/python_dependencies.py
- "bcrypt>=3.1.0": ["bcrypt>=3.1.0"],
+ "bcrypt": ["bcrypt"],
"pillow>=3.1.2": ["PIL"],
"pydenticon>=0.2": ["pydenticon"],
"sortedcontainers>=1.4.4": ["sortedcontainers"],
"psutil>=2.0.0": ["psutil>=2.0.0"],
......@@ -2,7 +2,7 @@ Index: package-synapse-debian/synapse/app/homeserver.py
===================================================================
--- package-synapse-debian.orig/synapse/app/homeserver.py
+++ package-synapse-debian/synapse/app/homeserver.py
@@ -125,7 +125,7 @@ class SynapseHomeServer(HomeServer):
@@ -124,7 +124,7 @@ class SynapseHomeServer(HomeServer):
for res in listener_config["resources"]:
for name in res["names"]:
resources.update(self._configure_named_resource(
......@@ -11,7 +11,7 @@ Index: package-synapse-debian/synapse/app/homeserver.py
))
additional_resources = listener_config.get("additional_resources", {})
@@ -172,7 +172,7 @@ class SynapseHomeServer(HomeServer):
@@ -171,7 +171,7 @@ class SynapseHomeServer(HomeServer):
)
logger.info("Synapse now listening on port %d", port)
......@@ -20,9 +20,9 @@ Index: package-synapse-debian/synapse/app/homeserver.py
"""Build a resource map for a named resource
Args:
@@ -239,7 +239,7 @@ class SynapseHomeServer(HomeServer):
SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
})
@@ -235,7 +235,7 @@ class SynapseHomeServer(HomeServer):
if name in ["keys", "federation"]:
resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self)
- if name == "webclient":
+ if name == "webclient" and config.web_client:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment