From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 8 Sep 2009 10:55:58 +0000 (+1200)
Subject: Prevent squidclient sending two Accept: headers
X-Git-Tag: SQUID_3_2_0_1~729
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f5ec547f9b6caffca7b03d9117dc451e0c1adac;p=thirdparty%2Fsquid.git

Prevent squidclient sending two Accept: headers
---

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 999648cecd..547dfe093d 100644
--- a/tools/squidclient.cc
+++ b/tools/squidclient.cc
@@ -436,16 +436,16 @@ main(int argc, char *argv[])
         /* HTTP/1.0 may need keep-alive */
         if (strcmp(version, "1.0") == 0) {
             if (keep_alive) {
-                if (strchr(url, ':'))
+                if (strchr(url, ':')) {
                     snprintf(buf, BUFSIZ, "Proxy-Connection: keep-alive\r\n");
-                else
+                    strcat(msg, buf);
+                } else
                     strcat(msg, "Connection: keep-alive\r\n");
             }
         } else {
             if (!keep_alive)
                 strcat(msg, "Connection: close\r\n");
         }
-        strcat(msg, buf);
 
         strcat(msg, extra_hdrs);
         strcat(msg, "\r\n");