diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-03 17:18:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-03 17:18:17 +0100 |
commit | d4902a7ad08140bfb48c10a67f56d22fee68d0ec (patch) | |
tree | 8c1da253a98d3f7f3aad1fafb83bdec9a5d493d5 /synapse/config/server.py | |
parent | Log where a request came from in federation (diff) | |
parent | Add config option to disable compression of http responses (diff) | |
download | synapse-d4902a7ad08140bfb48c10a67f56d22fee68d0ec.tar.xz |
Merge pull request #174 from matrix-org/erikj/compress_option
Add config option to disable compression of http responses
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 48a26c65d9..d0c8fb8f3c 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -29,6 +29,7 @@ class ServerConfig(Config): self.soft_file_limit = config["soft_file_limit"] self.daemonize = config.get("daemonize") self.use_frozen_dicts = config.get("use_frozen_dicts", True) + self.gzip_responses = config["gzip_responses"] # Attempt to guess the content_addr for the v0 content repostitory content_addr = config.get("content_addr") @@ -86,6 +87,11 @@ class ServerConfig(Config): # Turn on the twisted telnet manhole service on localhost on the given # port. #manhole: 9000 + + # Should synapse compress HTTP responses to clients that support it? + # This should be disabled if running synapse behind a load balancer + # that can do automatic compression. + gzip_responses: True """ % locals() def read_arguments(self, args): |