Bring in new dkim code

[citadel.git] / webcit / downloads.c

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 8363982082be08cf2a1ea6a8742e9526d200704a..9b7dde993c47f254174d3040a2540292ece34b3a 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_FILELIST = CTX_NONE;
 
@@ -271,13 +271,14 @@ void download_file(void)
                StrBufCutLeft(Buf, 4);
                bytes = StrBufExtract_long(Buf, 0, '|');
                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);
+
+               serv_read_binary_to_http(ContentType, bytes, 0, 0);
+               serv_puts("CLOS");
+               StrBuf_ServGetln(Buf);
        } else {
                StrBufCutLeft(Buf, 4);
                hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
@@ -413,10 +414,9 @@ void output_image(void)
        
        /*
         * Instead of an ugly 404, send a 1x1 transparent GIF
-        * when there's no such image on the server.
+        * when there's no such image on the server display blank
         */
-       StrBufPrintf (Buf, "%s%s", static_dirs[0], "/webcit_icons/blank.gif");
-       output_static(ChrPtr(Buf));
+       output_static(NULL);
        FreeStrBuf(&Buf);
 }