From: Nathan Hoad <nathan@getoffmalawn.com>
Date: Sun, 10 Apr 2016 04:31:51 +0000 (+1200)
Subject: Add a new error page token for unquoted external ACL messages.
X-Git-Tag: SQUID_4_0_9~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05dbf66cc46c53050d05b878bb09e0dc838bdce0;p=thirdparty%2Fsquid.git

Add a new error page token for unquoted external ACL messages.

This is useful for external ACLs that send back messages that contain
actual HTML.

This work is submitted on behalf of Bloomberg L.P.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 4550c28217..1732797886 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -7967,6 +7967,7 @@ DOC_START
 		%H	- Request domain name
 		%i	- Client IP Address
 		%M	- Request Method
+		%O	- Unescaped message result from external ACL helper
 		%o	- Message result from external ACL helper
 		%p	- Request Port number
 		%P	- Request Protocol name
diff --git a/src/errorpage.cc b/src/errorpage.cc
index 446b92b635..bf09a01300 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -927,6 +927,8 @@ ErrorState::Convert(char token, bool building_deny_info_url, bool allowRecursion
             p = "[unknown method]";
         break;
 
+    case 'O':
+        do_quote = 0;
     case 'o':
         p = request ? request->extacl_message.termedBuf() : external_acl_message;
         if (!p && !building_deny_info_url)