From: Amos Jeffries Date: Sat, 4 Oct 2008 07:33:01 +0000 (+1300) Subject: Fix NO DEFAULT compile errors X-Git-Tag: SQUID_3_1_0_1~52^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=024246123cbe2ccebc1d5faf9203c1d52a10c42a;p=thirdparty%2Fsquid.git Fix NO DEFAULT compile errors --- diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED index 97c9c94adf..8b8eaae737 100644 --- a/errors/templates/ERR_ACCESS_DENIED +++ b/errors/templates/ERR_ACCESS_DENIED @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED index 04f8dd5dec..80d72eceeb 100644 --- a/errors/templates/ERR_CACHE_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_ACCESS_DENIED @@ -21,4 +21,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED index b5d8588c44..27bb59b743 100644 --- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD index 2e11aecfd9..7f46955fa3 100644 --- a/errors/templates/ERR_CANNOT_FORWARD +++ b/errors/templates/ERR_CANNOT_FORWARD @@ -21,4 +21,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL index c25f747e94..6ff31584c0 100644 --- a/errors/templates/ERR_CONNECT_FAIL +++ b/errors/templates/ERR_CONNECT_FAIL @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL index eff729bba6..a74ece8053 100644 --- a/errors/templates/ERR_DNS_FAIL +++ b/errors/templates/ERR_DNS_FAIL @@ -25,4 +25,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI index 53928bcc96..daa051635e 100644 --- a/errors/templates/ERR_ESI +++ b/errors/templates/ERR_ESI @@ -25,4 +25,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED index e025f62d74..71822d9f3d 100644 --- a/errors/templates/ERR_FORWARDING_DENIED +++ b/errors/templates/ERR_FORWARDING_DENIED @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED index 4f3d7005d4..4fe2e9eeeb 100644 --- a/errors/templates/ERR_FTP_DISABLED +++ b/errors/templates/ERR_FTP_DISABLED @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE index 277db45391..eacc2fcd89 100644 --- a/errors/templates/ERR_FTP_FAILURE +++ b/errors/templates/ERR_FTP_FAILURE @@ -25,4 +25,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN index 9a38c1364e..3a435ef32c 100644 --- a/errors/templates/ERR_FTP_FORBIDDEN +++ b/errors/templates/ERR_FTP_FORBIDDEN @@ -25,4 +25,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND index fd1542fb6f..a1cb9077db 100644 --- a/errors/templates/ERR_FTP_NOT_FOUND +++ b/errors/templates/ERR_FTP_NOT_FOUND @@ -27,4 +27,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED index f53722be2c..f46d707b19 100644 --- a/errors/templates/ERR_FTP_PUT_CREATED +++ b/errors/templates/ERR_FTP_PUT_CREATED @@ -11,4 +11,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR index d0accc56d0..cb9d088ab1 100644 --- a/errors/templates/ERR_FTP_PUT_ERROR +++ b/errors/templates/ERR_FTP_PUT_ERROR @@ -26,4 +26,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED index c4a369d98b..6973df7a1c 100644 --- a/errors/templates/ERR_FTP_PUT_MODIFIED +++ b/errors/templates/ERR_FTP_PUT_MODIFIED @@ -11,4 +11,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE index b367faff46..47da1e4b94 100644 --- a/errors/templates/ERR_FTP_UNAVAILABLE +++ b/errors/templates/ERR_FTP_UNAVAILABLE @@ -26,4 +26,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE index 3e95873dc1..82e32a6867 100644 --- a/errors/templates/ERR_ICAP_FAILURE +++ b/errors/templates/ERR_ICAP_FAILURE @@ -26,4 +26,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ index 07813f7863..b325023f70 100644 --- a/errors/templates/ERR_INVALID_REQ +++ b/errors/templates/ERR_INVALID_REQ @@ -28,4 +28,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP index 8b754577e1..9de8b60104 100644 --- a/errors/templates/ERR_INVALID_RESP +++ b/errors/templates/ERR_INVALID_RESP @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL index eac579c4eb..34b9710500 100644 --- a/errors/templates/ERR_INVALID_URL +++ b/errors/templates/ERR_INVALID_URL @@ -28,4 +28,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP index d2c6b46b8f..4936963938 100644 --- a/errors/templates/ERR_LIFETIME_EXP +++ b/errors/templates/ERR_LIFETIME_EXP @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY index 992497a561..ba8b24d16b 100644 --- a/errors/templates/ERR_NO_RELAY +++ b/errors/templates/ERR_NO_RELAY @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS index 99200a0961..f93cb3a866 100644 --- a/errors/templates/ERR_ONLY_IF_CACHED_MISS +++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR index 56633bd436..ce6aea177e 100644 --- a/errors/templates/ERR_READ_ERROR +++ b/errors/templates/ERR_READ_ERROR @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT index 6b9642490c..5e0d03c27a 100644 --- a/errors/templates/ERR_READ_TIMEOUT +++ b/errors/templates/ERR_READ_TIMEOUT @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL index f6bc778719..7cee873b52 100644 --- a/errors/templates/ERR_SECURE_CONNECT_FAIL +++ b/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN index 6b0e5c012e..2a9b15f6ec 100644 --- a/errors/templates/ERR_SHUTTING_DOWN +++ b/errors/templates/ERR_SHUTTING_DOWN @@ -16,4 +16,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE index c4d2adeb09..99f0a9c1b6 100644 --- a/errors/templates/ERR_SOCKET_FAILURE +++ b/errors/templates/ERR_SOCKET_FAILURE @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG index bfb95b6257..d11478d3e6 100644 --- a/errors/templates/ERR_TOO_BIG +++ b/errors/templates/ERR_TOO_BIG @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ index b4768a3a9a..495595860b 100644 --- a/errors/templates/ERR_UNSUP_REQ +++ b/errors/templates/ERR_UNSUP_REQ @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE index e71ecd7136..39b045fcd3 100644 --- a/errors/templates/ERR_URN_RESOLVE +++ b/errors/templates/ERR_URN_RESOLVE @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR index 78b9b13d25..cdb5adbb75 100644 --- a/errors/templates/ERR_WRITE_ERROR +++ b/errors/templates/ERR_WRITE_ERROR @@ -22,4 +22,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT index 85cc32420e..baac5d3d30 100644 --- a/errors/templates/ERR_ZERO_SIZE_OBJECT +++ b/errors/templates/ERR_ZERO_SIZE_OBJECT @@ -20,4 +20,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/errors/templates/generic b/errors/templates/generic index 8990c47255..1a5ba814f3 100644 --- a/errors/templates/generic +++ b/errors/templates/generic @@ -23,4 +23,20 @@
+ +            +            +            +            +            +            +            +            +            +            +            +            +            +            +            diff --git a/src/cf.data.pre b/src/cf.data.pre index 4192bf3765..9c485b5161 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -2312,6 +2312,7 @@ DOC_END NAME: access_log cache_access_log TYPE: access_log LOC: Config.Log.accesslogs +DEFAULT: none DEFAULT_IF_NONE: @DEFAULT_ACCESS_LOG@ squid DOC_START These files log client request activities. Has a line every HTTP or @@ -2353,6 +2354,7 @@ DOC_END NAME: cache_log TYPE: string +DEFAULT: none DEFAULT_IF_NONE: @DEFAULT_CACHE_LOG@ LOC: Config.Log.log DOC_START