Postfix #2319: Don't set content type twice

aio-libs · Oct 13, 2017 · 4ffdb3a · 4ffdb3a
1 parent 12af78b
commit 4ffdb3a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/aiohttp/web_fileresponse.py b/aiohttp/web_fileresponse.py
@@ -186,9 +186,10 @@ def prepare(self, request):
             ct, encoding = mimetypes.guess_type(str(filepath))
             if not ct:
                 ct = 'application/octet-stream'
+            should_set_ct = True
         else:
-            ct = self.headers[hdrs.CONTENT_TYPE]
             encoding = 'gzip' if gzip else None
+            should_set_ct = False
 
         status = HTTPOk.status_code
         file_size = st.st_size
@@ -228,7 +229,8 @@ def prepare(self, request):
             status = HTTPPartialContent.status_code
 
         self.set_status(status)
-        self.content_type = ct
+        if should_set_ct:
+            self.content_type = ct
         if encoding:
             self.headers[hdrs.CONTENT_ENCODING] = encoding
         if gzip: