From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 12 Nov 2015 08:51:03 +0000 (+0200)
Subject: Bug 4372: missing template files
X-Git-Tag: SQUID_4_0_3~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6864a8b8dd1292446aae602c80f119a612bf77c2;p=thirdparty%2Fsquid.git

Bug 4372: missing template files

The ERR_SECURE_ACCEPT_FAIL and ERR_REQUEST_START_TIMEOUT errors apears that
have missing templates on squid startup.
Actually these errors does not produce any error page. Move them under the
TCP_RESET error in err_type.h to mark them as optional.

This is a Measurement Factory project
---

diff --git a/src/err_type.h b/src/err_type.h
index 4896b39a93..572b5952b0 100644
--- a/src/err_type.h
+++ b/src/err_type.h
@@ -27,7 +27,6 @@ typedef enum {
     ERR_WRITE_ERROR,
     ERR_CONNECT_FAIL,
     ERR_SECURE_CONNECT_FAIL,
-    ERR_SECURE_ACCEPT_FAIL,
     ERR_SOCKET_FAILURE,
 
     /* DNS Errors */
@@ -70,12 +69,14 @@ typedef enum {
     ERR_SQUID_SIGNATURE,        /* not really an error */
     ERR_SHUTTING_DOWN,
     ERR_PROTOCOL_UNKNOWN,
-    ERR_REQUEST_START_TIMEOUT,
 
     // NOTE: error types defined below TCP_RESET are optional and do not generate
     //       a log warning if the files are missing
     TCP_RESET,                  // Send TCP RST packet instead of error page
 
+    ERR_SECURE_ACCEPT_FAIL, // Rejects the SSL connection intead of error page
+    ERR_REQUEST_START_TIMEOUT, // Aborts the connection instead of error page
+
     /* Cache Manager GUI can install a manager index/home page */
     MGR_INDEX,