Merge from trunk r13414

diff --cc configure.ac
Simple merge

diff --cc src/acl/MethodData.cc
index f31ffb41133d3d35338438f6515e41197ddce327,dd00ff154646d9f4aa2a9e9971dc57b0e354244c..f0687109d704128d3e88e4343a5d433a72b2fe83
--- 1/src/acl/MethodData.cc
--- 2/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;
      }

diff --cc src/cache_cf.cc
Simple merge