From: wessels <>
Date: Wed, 14 Dec 2005 05:11:07 +0000 (+0000)
Subject: Don't print a Warning about OPTIONS reply method mismatch if the
X-Git-Tag: SQUID_3_0_PRE4~453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=576a57d4ee7111c638f74876c9449a9a3e46a471;p=thirdparty%2Fsquid.git

Don't print a Warning about OPTIONS reply method mismatch if the
OPTIONS reply doesn't have a Methods header.
---

diff --git a/src/ICAP/ICAPServiceRep.cc b/src/ICAP/ICAPServiceRep.cc
index c2d38dc7bb..72a1ed514b 100644
--- a/src/ICAP/ICAPServiceRep.cc
+++ b/src/ICAP/ICAPServiceRep.cc
@@ -287,7 +287,7 @@ void ICAPServiceRep::changeOptions(ICAPOptions *newOptions)
      * then discovered the method via OPTIONS
      */
 
-    if (theOptions->method != method)
+    if (theOptions->method != method && theOptions->method != ICAP::methodNone)
         debugs(93,1, "WARNING: Squid is configured to use ICAP method " << ICAP::methodStr(method) <<
                " for service " << uri.buf() <<
                " but OPTIONS response declares the method is " << ICAP::methodStr(theOptions->method));