From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 17 May 2014 05:49:04 +0000 (-0700)
Subject: Merge from trunk r13414
X-Git-Tag: merge-candidate-3-v1~506^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8201f784e0735b240f60d6f918de0b1bcfb12a;p=thirdparty%2Fsquid.git

Merge from trunk r13414
---

1d8201f784e0735b240f60d6f918de0b1bcfb12a
diff --cc src/acl/MethodData.cc
index f31ffb4113,dd00ff1546..f0687109d7
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@@ -89,9 -89,9 +89,9 @@@ ACLMethodData::parse(
  
      for (Tail = &values; *Tail; Tail = &((*Tail)->next));
      while ((t = strtokFile())) {
-         if (strcmp(t, "PURGE") == 0)
-             ++ThePurgeCount; // configuration code wants to know
 -        CbDataList<HttpRequestMethod> *q = new CbDataList<HttpRequestMethod> (HttpRequestMethod(t, NULL));
 +        CbDataList<HttpRequestMethod> *q = new CbDataList<HttpRequestMethod> (HttpRequestMethod(t));
+         if (q->element == Http::METHOD_PURGE)
+             ++ThePurgeCount; // configuration code wants to know
          *(Tail) = q;
          Tail = &q->next;
      }