add a blacklist of mimetypes which we won't gzip compress on the way out.

[citadel.git] / webcit / downloads.c

diff --git a/webcit/downloads.c b/webcit/downloads.c
index ccb60390809c6c4a578d556782356cc6a96fe9fa..8363982082be08cf2a1ea6a8742e9526d200704a 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -270,12 +270,13 @@ void download_file(void)
        if (GetServerStatus(Buf, NULL) == 2) {
                StrBufCutLeft(Buf, 4);
                bytes = StrBufExtract_long(Buf, 0, '|');
-               if (!force_download) {
-                       StrBufExtract_token(ContentType, Buf, 3, '|');
-               }
+               StrBufExtract_token(ContentType, Buf, 3, '|');
                serv_read_binary(WCC->WBuf, bytes, Buf);
                serv_puts("CLOS");
                StrBuf_ServGetln(Buf);
+               CheckGZipCompressionAllowed (SKEY(ContentType));
+               if (force_download)
+                       FlushStrBuf(ContentType);
                http_transmit_thing(ChrPtr(ContentType), 0);
        } else {
                StrBufCutLeft(Buf, 4);
@@ -397,6 +398,7 @@ void output_image(void)
                        /** Write it to the browser */
                        if (!IsEmptyStr(MimeType))
                        {
+                               CheckGZipCompressionAllowed (MimeType, strlen(MimeType));
                                http_transmit_thing(MimeType, 0);
                                FreeStrBuf(&Buf);
                                return;