From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 14 May 2013 18:36:45 +0000 (-0600)
Subject: Drop terminal comments and garbage options from cache_peer lines
X-Git-Tag: SQUID_3_4_0_1~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d22bac389616a0f14835a843251f32ffd4db59c;p=thirdparty%2Fsquid.git

Drop terminal comments and garbage options from cache_peer lines
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index f26e43db51..265abd09c0 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -2335,9 +2335,11 @@ parse_peer(CachePeer ** head)
             p->connection_auth = 1;
         } else if (strcmp(token, "connection-auth=auto") == 0) {
             p->connection_auth = 2;
+        } else if (token[0] == '#') {
+            // start of a text comment. stop reading this line.
+            break;
         } else {
-            debugs(3, DBG_CRITICAL, "parse_peer: token='" << token << "'");
-            self_destruct();
+            debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "ERROR: Ignoring unknown cache_peer option '" << token << "'");
         }
     }