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 4550c28217e55c11fef9c2c2b1f13b8fc7eb4f03..17327978865958202beb3e2209619efeb8792c31 100644 (file)
--- 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 446b92b63581eab4b1c285821095131dfa6eac52..bf09a013005f4d928a843fbc02d074217cf71014 100644 (file)
--- 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)