X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdownloads.c;h=6e6c9b981b5ebf0acf8bc46dc664fc9630956acd;hb=HEAD;hp=f39622495cc9ca918faf1b3624a1ed4e08cd9b41;hpb=5d38a76f8f06640e3a3f097d584ac52336110f7c;p=citadel.git

diff --git a/webcit/downloads.c b/webcit/downloads.c
index f39622495..9b7dde993 100644
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_FILELIST = CTX_NONE;
 
@@ -270,13 +270,15 @@ 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, '|');
-		}
-		serv_read_binary(WCC->WBuf, bytes, Buf);
+		StrBufExtract_token(ContentType, Buf, 3, '|');
+
+		CheckGZipCompressionAllowed (SKEY(ContentType));
+		if (force_download)
+			FlushStrBuf(ContentType);
+
+		serv_read_binary_to_http(ContentType, bytes, 0, 0);
 		serv_puts("CLOS");
 		StrBuf_ServGetln(Buf);
-		http_transmit_thing(ChrPtr(ContentType), 0);
 	} else {
 		StrBufCutLeft(Buf, 4);
 		hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
@@ -397,6 +399,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;
@@ -411,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);
 }
 
@@ -464,7 +466,7 @@ InitModule_DOWNLOAD
 	RegisterNamespace("FILE:MIMETYPE", 0, 2, tmplput_FILEMIMETYPE, NULL, CTX_FILELIST);
 	RegisterNamespace("FILE:COMMENT", 0, 2, tmplput_FILE_COMMENT, NULL, CTX_FILELIST);
 
-	RegisterConditional(HKEY("COND:FILE:ISPIC"), 0, Conditional_FILE_ISPIC, CTX_FILELIST);
+	RegisterConditional("COND:FILE:ISPIC", 0, Conditional_FILE_ISPIC, CTX_FILELIST);
 
 	WebcitAddUrlHandler(HKEY("image"), "", 0, output_image, ANONYMOUS);
 	WebcitAddUrlHandler(HKEY("display_mime_icon"), "", 0, display_mime_icon , ANONYMOUS);