From: Amos Jeffries Date: Sat, 4 Oct 2008 11:11:41 +0000 (+1300) Subject: Undo r9254. Bad mixed commit X-Git-Tag: SQUID_3_1_0_1~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f43b40cc4d628075ea0645950fcf18e55f2db460;p=thirdparty%2Fsquid.git Undo r9254. Bad mixed commit --- diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED index 8b8eaae737..97c9c94adf 100644 --- a/errors/templates/ERR_ACCESS_DENIED +++ b/errors/templates/ERR_ACCESS_DENIED @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED index 80d72eceeb..04f8dd5dec 100644 --- a/errors/templates/ERR_CACHE_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_ACCESS_DENIED @@ -21,20 +21,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED index 27bb59b743..b5d8588c44 100644 --- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD index 7f46955fa3..2e11aecfd9 100644 --- a/errors/templates/ERR_CANNOT_FORWARD +++ b/errors/templates/ERR_CANNOT_FORWARD @@ -21,20 +21,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL index 6ff31584c0..c25f747e94 100644 --- a/errors/templates/ERR_CONNECT_FAIL +++ b/errors/templates/ERR_CONNECT_FAIL @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL index a74ece8053..eff729bba6 100644 --- a/errors/templates/ERR_DNS_FAIL +++ b/errors/templates/ERR_DNS_FAIL @@ -25,20 +25,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI index daa051635e..53928bcc96 100644 --- a/errors/templates/ERR_ESI +++ b/errors/templates/ERR_ESI @@ -25,20 +25,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED index 71822d9f3d..e025f62d74 100644 --- a/errors/templates/ERR_FORWARDING_DENIED +++ b/errors/templates/ERR_FORWARDING_DENIED @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED index 4fe2e9eeeb..4f3d7005d4 100644 --- a/errors/templates/ERR_FTP_DISABLED +++ b/errors/templates/ERR_FTP_DISABLED @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE index eacc2fcd89..277db45391 100644 --- a/errors/templates/ERR_FTP_FAILURE +++ b/errors/templates/ERR_FTP_FAILURE @@ -25,20 +25,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN index 3a435ef32c..9a38c1364e 100644 --- a/errors/templates/ERR_FTP_FORBIDDEN +++ b/errors/templates/ERR_FTP_FORBIDDEN @@ -25,20 +25,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND index a1cb9077db..fd1542fb6f 100644 --- a/errors/templates/ERR_FTP_NOT_FOUND +++ b/errors/templates/ERR_FTP_NOT_FOUND @@ -27,20 +27,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED index f46d707b19..f53722be2c 100644 --- a/errors/templates/ERR_FTP_PUT_CREATED +++ b/errors/templates/ERR_FTP_PUT_CREATED @@ -11,20 +11,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR index cb9d088ab1..d0accc56d0 100644 --- a/errors/templates/ERR_FTP_PUT_ERROR +++ b/errors/templates/ERR_FTP_PUT_ERROR @@ -26,20 +26,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED index 6973df7a1c..c4a369d98b 100644 --- a/errors/templates/ERR_FTP_PUT_MODIFIED +++ b/errors/templates/ERR_FTP_PUT_MODIFIED @@ -11,20 +11,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE index 47da1e4b94..b367faff46 100644 --- a/errors/templates/ERR_FTP_UNAVAILABLE +++ b/errors/templates/ERR_FTP_UNAVAILABLE @@ -26,20 +26,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE index 82e32a6867..3e95873dc1 100644 --- a/errors/templates/ERR_ICAP_FAILURE +++ b/errors/templates/ERR_ICAP_FAILURE @@ -26,20 +26,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ index b325023f70..07813f7863 100644 --- a/errors/templates/ERR_INVALID_REQ +++ b/errors/templates/ERR_INVALID_REQ @@ -28,20 +28,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP index 9de8b60104..8b754577e1 100644 --- a/errors/templates/ERR_INVALID_RESP +++ b/errors/templates/ERR_INVALID_RESP @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL index 34b9710500..eac579c4eb 100644 --- a/errors/templates/ERR_INVALID_URL +++ b/errors/templates/ERR_INVALID_URL @@ -28,20 +28,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP index 4936963938..d2c6b46b8f 100644 --- a/errors/templates/ERR_LIFETIME_EXP +++ b/errors/templates/ERR_LIFETIME_EXP @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY index ba8b24d16b..992497a561 100644 --- a/errors/templates/ERR_NO_RELAY +++ b/errors/templates/ERR_NO_RELAY @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS index f93cb3a866..99200a0961 100644 --- a/errors/templates/ERR_ONLY_IF_CACHED_MISS +++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR index ce6aea177e..56633bd436 100644 --- a/errors/templates/ERR_READ_ERROR +++ b/errors/templates/ERR_READ_ERROR @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT index 5e0d03c27a..6b9642490c 100644 --- a/errors/templates/ERR_READ_TIMEOUT +++ b/errors/templates/ERR_READ_TIMEOUT @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL index 7cee873b52..f6bc778719 100644 --- a/errors/templates/ERR_SECURE_CONNECT_FAIL +++ b/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN index 2a9b15f6ec..6b0e5c012e 100644 --- a/errors/templates/ERR_SHUTTING_DOWN +++ b/errors/templates/ERR_SHUTTING_DOWN @@ -16,20 +16,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE index 99f0a9c1b6..c4d2adeb09 100644 --- a/errors/templates/ERR_SOCKET_FAILURE +++ b/errors/templates/ERR_SOCKET_FAILURE @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG index d11478d3e6..bfb95b6257 100644 --- a/errors/templates/ERR_TOO_BIG +++ b/errors/templates/ERR_TOO_BIG @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ index 495595860b..b4768a3a9a 100644 --- a/errors/templates/ERR_UNSUP_REQ +++ b/errors/templates/ERR_UNSUP_REQ @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE index 39b045fcd3..e71ecd7136 100644 --- a/errors/templates/ERR_URN_RESOLVE +++ b/errors/templates/ERR_URN_RESOLVE @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR index cdb5adbb75..78b9b13d25 100644 --- a/errors/templates/ERR_WRITE_ERROR +++ b/errors/templates/ERR_WRITE_ERROR @@ -22,20 +22,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT index baac5d3d30..85cc32420e 100644 --- a/errors/templates/ERR_ZERO_SIZE_OBJECT +++ b/errors/templates/ERR_ZERO_SIZE_OBJECT @@ -20,20 +20,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/errors/templates/generic b/errors/templates/generic index 1a5ba814f3..8990c47255 100644 --- a/errors/templates/generic +++ b/errors/templates/generic @@ -23,20 +23,4 @@

- -            -            -            -            -            -            -            -            -            -            -            -            -            -            -            diff --git a/src/cf.data.pre b/src/cf.data.pre index 9c485b5161..4192bf3765 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -2312,7 +2312,6 @@ 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 @@ -2354,7 +2353,6 @@ DOC_END NAME: cache_log TYPE: string -DEFAULT: none DEFAULT_IF_NONE: @DEFAULT_CACHE_LOG@ LOC: Config.Log.log DOC_START