From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Jul 2010 00:08:35 +0000 (+0200)
Subject: httpd: simplified "gzip" test
X-Git-Tag: android-x86-4.4-r1~958
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5dbd56d776ec51281dd6fcc345baf77b4eac953;p=android-x86%2Fexternal-busybox.git

httpd: simplified "gzip" test

function                                             old     new   delta
handle_incoming_and_exit                            2830    2807     -23

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 cad45cd5d..3fea3f04c 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2081,18 +2081,18 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
 #endif
 #if ENABLE_FEATURE_HTTPD_GZIP
 			if (STRNCASECMP(iobuf, "Accept-Encoding:") == 0) {
-				char *s = iobuf + sizeof("Accept-Encoding:")-1;
-				while (*s) {
-					///is "Accept-Encoding: compress,gzip" valid?
-					// (that is, no space after ',') -
-					// this code won't handle that
-					s = skip_whitespace(s);
-					if (STRNCASECMP(s, "gzip") == 0)
+				/* Note: we do not support "gzip;q=0"
+				 * method of _disabling_ gzip
+				 * delivery. No one uses that, though */
+				const char *s = strstr(iobuf, "gzip");
+				if (s) {
+					// want more thorough checks?
+					//if (s[-1] == ' '
+					// || s[-1] == ','
+					// || s[-1] == ':'
+					//) {
 						content_gzip = 1;
-					/* Note: we do not support "gzip;q=0"
-					 * method of _disabling_ gzip
-					 * delivery */
-					s = skip_non_whitespace(s);
+					//}
 				}
 			}
 #endif