From 154be258da6c2ab29916c776a1d84ce84a3a7ddf Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 11 Nov 2012 00:03:49 +1300
Subject: [PATCH] Polish away some omitted changes

---
 src/HelperReply.cc  | 2 +-
 src/external_acl.cc | 6 ------
 src/helper.h        | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/HelperReply.cc b/src/HelperReply.cc
index 26f0de842a..08314f8a81 100644
--- a/src/HelperReply.cc
+++ b/src/HelperReply.cc
@@ -147,7 +147,7 @@ std::ostream &
 operator <<(std::ostream &os, const HelperReply &r)
 {
     os << "{result=";
-    switch(r.result) {
+    switch (r.result) {
     case HelperReply::Okay:
         os << "OK";
         break;
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 952e95c02e..a7d5640c31 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -363,9 +363,6 @@ parse_externalAclHelper(external_acl ** list)
         } else if (strcmp(token, "protocol=3.0") == 0) {
             debugs(3, DBG_PARSE_NOTE(2), "WARNING: external_acl_type option protocol=3.0 is deprecated. Remove this from your config.");
             a->quote = external_acl::QUOTE_METHOD_URL;
-        } else if (strcmp(token, "protocol=3.4") == 0) {
-            debugs(3, DBG_PARSE_NOTE(2), "WARNING: external_acl_type option protocol=3.4 is the default. Remove this from your config.");
-            a->quote = external_acl::QUOTE_METHOD_URL;
         } else if (strcmp(token, "quote=url") == 0) {
             debugs(3, DBG_PARSE_NOTE(2), "WARNING: external_acl_type option quote=url is deprecated. Remove this from your config.");
             a->quote = external_acl::QUOTE_METHOD_URL;
@@ -1508,9 +1505,6 @@ externalAclInit(void)
 
         p->theHelper->addr = p->local_addr;
 
-        if (p->quote == external_acl::QUOTE_METHOD_URL)
-            p->theHelper->url_quoting = true;
-
         helperOpenServers(p->theHelper);
     }
 
diff --git a/src/helper.h b/src/helper.h
index 7e1f235813..1ee9d5e904 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -48,7 +48,7 @@ typedef void HLPCB(void *, const HelperReply &reply);
 class helper
 {
 public:
-    inline helper(const char *name) : cmdline(NULL), id_name(name), eom('\n'), url_quoting(false) {}
+    inline helper(const char *name) : cmdline(NULL), id_name(name), eom('\n') {}
     ~helper();
 
 public:
@@ -62,7 +62,6 @@ public:
     time_t last_queue_warn;
     time_t last_restart;
     char eom;   ///< The char which marks the end of (response) message, normally '\n'
-    bool url_quoting;
 
     struct _stats {
         int requests;
-- 
2.47.3