Merged from trunk (r12852).

diff --cc src/AclRegs.cc
index 3b5cb0bd8674cdf8957168e8452af9318f12c491,ff65937df219659284b5e728a9f761c7eb88b108..54656f96b81d5ca01c0ab892ecafe345a542c868
--- 1/src/AclRegs.cc
--- 2/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@@ -183,8 -184,5 +185,11 @@@ ACLMaxUserIP ACLMaxUserIP::RegistryEntr
  ACL::Prototype ACLTag::RegistryProtoype(&ACLTag::RegistryEntry_, "tag");
  ACLStrategised<const char *> ACLTag::RegistryEntry_(new ACLStringData, ACLTagStrategy::Instance(), "tag");
  
 +ACL::Prototype Acl::AnyOf::RegistryProtoype(&Acl::AnyOf::RegistryEntry_, "any-of");
 +Acl::AnyOf Acl::AnyOf::RegistryEntry_;
 +
 +ACL::Prototype Acl::AllOf::RegistryProtoype(&Acl::AllOf::RegistryEntry_, "all-of");
 +Acl::AllOf Acl::AllOf::RegistryEntry_;
++
+ ACL::Prototype ACLNote::RegistryProtoype(&ACLNote::RegistryEntry_, "note");
+ ACLStrategised<HttpRequest *> ACLNote::RegistryEntry_(new ACLNoteData, ACLNoteStrategy::Instance(), "note");

diff --cc src/HttpHeaderTools.h
index 5f097977d86044f764d8a6b851750b07d021b250,88046f2d172743d141a813e045f7ec87b74053ea..ac273b34940ddd08f4ef72cce4122252261e1d0f
--- 1/src/HttpHeaderTools.h
--- 2/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@@ -15,7 -17,12 +18,10 @@@
  #if HAVE_STRING
  #include <string>
  #endif
+ #if HAVE_STRINGS_H
+ #include <strings.h>
+ #endif
  
 -class acl_access;
 -class ACLList;
  class HeaderWithAcl;
  class HttpHeader;
  class HttpHeaderFieldInfo;

diff --cc src/Notes.cc
Simple merge

diff --cc src/Notes.h
Simple merge

diff --cc src/acl/Asn.cc
index f7d3ca447b1bf5a0ef829bb3d005c6300a07c497,6966e6f3f43bca25ff6f37d7d2269bdbd7c13095..50842828119c814cbd8fad5b07c37c5f29afcf42
--- 1/src/acl/Asn.cc
--- 2/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@@ -636,12 -636,9 +636,11 @@@ ACLDestinationASNStrategy::match (ACLDa
  
      } else if (!checklist->request->flags.destinationIpLookedUp) {
          /* No entry in cache, lookup not attempted */
-         /* XXX FIXME: allow accessing the acl name here */
-         debugs(28, 3, "asnMatchAcl: Can't yet compare '" << "unknown" /*name*/ << "' ACL for '" << checklist->request->GetHost() << "'");
+         debugs(28, 3, "asnMatchAcl: Can't yet compare '" << AclMatchedName << "' ACL for '" << checklist->request->GetHost() << "'");
 -        checklist->changeState (DestinationIPLookup::Instance());
 -    } else {
 +        if (checklist->goAsync(DestinationIPLookup::Instance()))
 +            return -1;
 +        // else fall through to noaddr match, hiding the lookup failure (XXX)
 +    }
          Ip::Address noaddr;
          noaddr.SetNoAddr();
          return data->match(noaddr);

diff --cc src/acl/FilledChecklist.h
Simple merge

diff --cc src/acl/Makefile.am
Simple merge

diff --cc src/auth/AclProxyAuth.cc
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/external_acl.cc
Simple merge