From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 14 May 2013 15:31:15 +0000 (-0600)
Subject: Log an ERROR instead of halting on unknown cache_dir types
X-Git-Tag: SQUID_3_4_0_1~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1a3707246573cc6aa401ebfa1a29f1926ca7dab;p=thirdparty%2Fsquid.git

Log an ERROR instead of halting on unknown cache_dir types

Squid-3 can run fine without any configured cache_dir. This assists with
upgrade from older Squid-2 where COSS or NULL cache types may be present.
It also assists with backward compatibility for any future cache types
which may be added in future.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 6d15433564..f26e43db51 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1912,8 +1912,10 @@ parse_cachedir(SquidConfig::_cacheSwap * swap)
 
     fs = find_fstype(type_str);
 
-    if (fs < 0)
-        self_destruct();
+    if (fs < 0) {
+        debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "ERROR: This proxy does not support the '" << type_str << "' cache type. Ignoring.");
+        return;
+    }
 
     /* reconfigure existing dir */