From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 22 May 2014 20:55:56 +0000 (-0600)
Subject: Renamed atstep ACL to at_step to be more consistent with other ACL names.
X-Git-Tag: SQUID_3_5_0_1~89^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=652fcffdb4882d5c4b0fb688fdf32f47682309df;p=thirdparty%2Fsquid.git

Renamed atstep ACL to at_step to be more consistent with other ACL names.
---

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 3a7cd16f5e..54826c0bc2 100644
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -165,8 +165,8 @@ ACLStrategised<X509 *> ACLCertificate::CARegistryEntry_(new ACLCertificateData (
 ACL::Prototype ACLServerCertificate::X509FingerprintRegistryProtoype(&ACLServerCertificate::X509FingerprintRegistryEntry_, "server_cert_fingerprint");
 ACLStrategised<X509 *> ACLServerCertificate::X509FingerprintRegistryEntry_(new ACLCertificateData(Ssl::GetX509Fingerprint, "-sha1", true), ACLServerCertificateStrategy::Instance(), "server_cert_fingerprint");
 
-ACL::Prototype ACLAtStep::RegistryProtoype(&ACLAtStep::RegistryEntry_, "atstep");
-ACLStrategised<Ssl::BumpStep> ACLAtStep::RegistryEntry_(new ACLAtStepData, ACLAtStepStrategy::Instance(), "atstep");
+ACL::Prototype ACLAtStep::RegistryProtoype(&ACLAtStep::RegistryEntry_, "at_step");
+ACLStrategised<Ssl::BumpStep> ACLAtStep::RegistryEntry_(new ACLAtStepData, ACLAtStepStrategy::Instance(), "at_step");
 #endif
 
 #if USE_SQUID_EUI
diff --git a/src/cf.data.pre b/src/cf.data.pre
index babd12864e..c6bce1173f 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1149,7 +1149,7 @@ IF USE_OPENSSL
 	  # The SHA1 digest algorithm is the default and is currently
 	  # the only algorithm supported (-sha1).
 
-	acl aclname atstep step
+	acl aclname at_step step
 	  # match against the current step during ssl_bump evaluation [fast]
 	  # Never matches and should not be used outside the ssl_bump context.
 	  #
@@ -2507,12 +2507,12 @@ DOC_START
 	steps.  Rules with actions that are impossible at the current step are
 	ignored. The first matching ssl_bump action wins and is applied at the
 	end of the current step. If no rules match, the splice action is used.
-	See atstep ACL for a list of the supported SslBump steps.
+	See the at_step ACL for a list of the supported SslBump steps.
 
 	This clause supports both fast and slow acl types.
 	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
 
-	See also: http_port ssl-bump, https_port ssl-bump, and atstep ACL.
+	See also: http_port ssl-bump, https_port ssl-bump, and acl at_step.
 
 
 	# Example: Bump all requests except those originating from