Author: Alex Rousskov <rousskov@measurement-factory.com>

Accept ICAP OPTIONS responses with unknown body types.

Warn about the unknown OPTIONS body type but ignore it instead of rejecting
the entire OPTIONS response. Note that ICAP does not standardize OPTIONS
body types, and Squid does not recognize any body type.

ICAP servers are supposed to negotiate the use of OPTIONS bodies but
negotiation mechanism is not standardized and some do not negotiate at all.

diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc
index 630dcbfbc43bf11979b66bfaca7a2ac91b02624a..b08a857d4d4445bcf4237ecbfb834b9d0b48b656 100644 (file)
--- a/src/adaptation/icap/Options.cc
+++ b/src/adaptation/icap/Options.cc
@@ -89,8 +89,12 @@ void Adaptation::Icap::Options::configure(const HttpReply *reply)
 
     istag = h->getByName("ISTag");
 
-    if (h->getByName("Opt-body-type").size())
-        error = "ICAP service returns unsupported OPTIONS body";
+    if (h->getByName("Opt-body-type").size()) {
+        // TODO: add a class to rate-limit such warnings using FadingCounter
+        debugs(93,DBG_IMPORTANT, "WARNING: Ignoring unsupported ICAP " <<
+            "OPTIONS body; type: " << h->getByName("Opt-body-type"));
+        // Do not set error, assuming the response headers are valid.
+    }
 
     cfgIntHeader(h, "Max-Connections", max_connections);