------------------------------------------------------------
revno: 12282
revision-id: squid3@treenet.co.nz-20120813072450-ytqp6veu41lj3f5h
parent: squidadm@squid-cache.org-20120813001509-aw2co6u9k7os2r1d
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3610
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2012-08-13 01:24:50 -0600
message:
  Bug 3610: peername_regex ACL
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120813072450-ytqp6veu41lj3f5h
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 951681b2201ebad0955bc6784de54167c927b7a3
# timestamp: 2012-08-13 07:51:39 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20120813001509-\
#   aw2co6u9k7os2r1d
# 
# Begin patch
=== modified file 'src/AclRegs.cc'
--- src/AclRegs.cc	2012-02-24 13:17:24 +0000
+++ src/AclRegs.cc	2012-08-13 07:24:50 +0000
@@ -109,6 +109,8 @@
 ACLStrategised<const char *> ACLMyPortName::RegistryEntry_(new ACLStringData, ACLMyPortNameStrategy::Instance(), "myportname");
 ACL::Prototype ACLPeerName::RegistryProtoype(&ACLPeerName::RegistryEntry_, "peername");
 ACLStrategised<const char *> ACLPeerName::RegistryEntry_(new ACLStringData, ACLPeerNameStrategy::Instance(), "peername");
+ACL::Prototype ACLPeerName::RegexRegistryProtoype(&ACLPeerName::RegexRegistryEntry_, "peername_regex");
+ACLStrategised<char const *> ACLPeerName::RegexRegistryEntry_(new ACLRegexData, ACLPeerNameStrategy::Instance(), "peername_regex");
 ACL::Prototype ACLProtocol::RegistryProtoype(&ACLProtocol::RegistryEntry_, "proto");
 ACLStrategised<AnyP::ProtocolType> ACLProtocol::RegistryEntry_(new ACLProtocolData, ACLProtocolStrategy::Instance(), "proto");
 ACL::Prototype ACLRandom::RegistryProtoype(&ACLRandom::RegistryEntry_, "random");

=== modified file 'src/acl/PeerName.cc'
--- src/acl/PeerName.cc	2012-01-20 18:55:04 +0000
+++ src/acl/PeerName.cc	2012-08-13 07:24:50 +0000
@@ -1,5 +1,6 @@
 #include "squid-old.h"
 #include "acl/PeerName.h"
+#include "acl/RegexData.h"
 #include "acl/StringData.h"
 #include "acl/Checklist.h"
 

=== modified file 'src/acl/PeerName.h'
--- src/acl/PeerName.h	2009-03-08 21:53:27 +0000
+++ src/acl/PeerName.h	2012-08-13 07:24:50 +0000
@@ -28,6 +28,8 @@
 private:
     static ACL::Prototype RegistryProtoype;
     static ACLStrategised<const char *> RegistryEntry_;
+    static ACL::Prototype RegexRegistryProtoype;
+    static ACLStrategised<char const *> RegexRegistryEntry_;
 };
 
 #endif /* SQUID_ACLPEERNAME_H */