From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 25 Mar 2011 12:38:52 +0000 (+0100)
Subject: httpd: don't send error messages with gzip encoding
X-Git-Tag: 1_19_0~206
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=95755181b828cccaa833d7b8d1d47174b7b360b7;p=oweals%2Fbusybox.git

httpd: don't send error messages with gzip encoding

If CONFIG_FEATURE_HTTPD_GZIP is enabled and request contained
'Accept-Encoding: gzip', then errors were sent with 'Content-Encoding: gzip'
even though they aren't.

Fix it by clearing content_gzip before sending the headers.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/httpd.c b/networking/httpd.c
index b8113a843..9c1aa2a6f 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1065,6 +1065,7 @@ static void send_headers(int responseNum)
 static void send_headers_and_exit(int responseNum) NORETURN;
 static void send_headers_and_exit(int responseNum)
 {
+	IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
 	send_headers(responseNum);
 	log_and_exit();
 }