From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 4 Mar 2012 06:34:39 +0000 (-0700)
Subject: Support for 3.2 error template codes
X-Git-Tag: SQUID_3_1_20~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f7869a2e04db086da35bce490b3dab9bb730c7;p=thirdparty%2Fsquid.git

Support for 3.2 error template codes
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 34800371b9..927b4ec2cb 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -616,6 +616,12 @@ ErrorState::Convert(char token, bool allowRecursion)
 
         break;
 
+    case 'b':
+        // NP: dynamic location of proxy-port not supported on 3.1
+        // display the generic well-known port instead
+        p = "3128";
+        break;
+
     case 'B':
         p = request ? ftpUrlWith2f(request) : "[no URL]";
 
@@ -836,6 +842,10 @@ ErrorState::Convert(char token, bool allowRecursion)
 
         break;
 
+    case 'x':
+        p = "[Not Available]"; // not supported by 3.1
+        break;
+
     case 'z':
         if (dnsError.size() > 0)
             p = dnsError.termedBuf();