summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-05-19 13:19:47 +0100
committerDavid Baker <dave@matrix.org>2015-05-19 13:20:25 +0100
commit19505e03921e2e239e99233f3faae083c105501a (patch)
tree395f3fa7339c6104e3d78b844b2714b8f210092b /synapse/app
parentAdd forgotten .items() (diff)
downloadsynapse-19505e03921e2e239e99233f3faae083c105501a.tar.xz
Disable GZip encoding on static file resources as per comment
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index dfb5314ff7..fa43211415 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -97,7 +97,13 @@ class SynapseHomeServer(HomeServer):
         import syweb
         syweb_path = os.path.dirname(syweb.__file__)
         webclient_path = os.path.join(syweb_path, "webclient")
-        return GzipFile(webclient_path)  # TODO configurable?
+        # GZip is disabled here due to
+        # https://twistedmatrix.com/trac/ticket/7678
+        # (It can stay enabled for the API resources: they call
+        # write() with the whole body and then finish() straight
+        # after and so do not trigger the bug.
+        # return GzipFile(webclient_path)  # TODO configurable?
+        return File(webclient_path)  # TODO configurable?
 
     def build_resource_for_static_content(self):
         # This is old and should go away: not going to bother adding gzip