ERROR: The requested URL could not be retrieved

From: Amos Jeffries Date: Wed, 19 Nov 2008 12:00:15 +0000 (+1300) Subject: Bug 2525: invalid encoding of non iso-8859-1 error pages X-Git-Tag: SQUID_3_2_0_1~1325 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e2a862a08131766552702a9f46d39eaac7dfbfa;p=thirdparty%2Fsquid.git Bug 2525: invalid encoding of non iso-8859-1 error pages Translation toolkit was not updating the content-type when bundling translations. It has since been updated to a version which does 'tidy' the output HTML. Also updating the default templates ISO-8859-1 coding to UTF-8 to present a usable backup in case of such future failures. --- diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED index 3812c8690a..5b446a8c35 100644 --- a/errors/templates/ERR_ACCESS_DENIED +++ b/errors/templates/ERR_ACCESS_DENIED @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED index f6bd6a0926..92f8e94eb3 100644 --- a/errors/templates/ERR_CACHE_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_ACCESS_DENIED @@ -1,6 +1,6 @@ - + ERROR: Cache Access Denied diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED index 71a4621d2c..d22fdab377 100644 --- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED @@ -1,6 +1,6 @@ - + ERROR: Cache Manager Access Denied diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD index 027b8a808f..0b5113e780 100644 --- a/errors/templates/ERR_CANNOT_FORWARD +++ b/errors/templates/ERR_CANNOT_FORWARD @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL index 71fae8762d..0c19884db6 100644 --- a/errors/templates/ERR_CONNECT_FAIL +++ b/errors/templates/ERR_CONNECT_FAIL @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL index adcb022c38..da2d334c0a 100644 --- a/errors/templates/ERR_DNS_FAIL +++ b/errors/templates/ERR_DNS_FAIL @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI index 561503006d..c2789e4cea 100644 --- a/errors/templates/ERR_ESI +++ b/errors/templates/ERR_ESI @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED index 34e2a8be6a..8c5169c6d6 100644 --- a/errors/templates/ERR_FORWARDING_DENIED +++ b/errors/templates/ERR_FORWARDING_DENIED @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED index 35f230cc64..5e590b9402 100644 --- a/errors/templates/ERR_FTP_DISABLED +++ b/errors/templates/ERR_FTP_DISABLED @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE index 4d16a34a7c..0461dfcbf9 100644 --- a/errors/templates/ERR_FTP_FAILURE +++ b/errors/templates/ERR_FTP_FAILURE @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN index 1bf0b1ecad..ef833b5bcd 100644 --- a/errors/templates/ERR_FTP_FORBIDDEN +++ b/errors/templates/ERR_FTP_FORBIDDEN @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FTP_LISTING b/errors/templates/ERR_FTP_LISTING index e66771d0ec..727a6e9a17 100644 --- a/errors/templates/ERR_FTP_LISTING +++ b/errors/templates/ERR_FTP_LISTING @@ -1,6 +1,6 @@ - + FTP Directory: %U diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND index 635170ccef..0d64df0b8b 100644 --- a/errors/templates/ERR_FTP_NOT_FOUND +++ b/errors/templates/ERR_FTP_NOT_FOUND @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED index 8bab56472d..e10ada13bb 100644 --- a/errors/templates/ERR_FTP_PUT_CREATED +++ b/errors/templates/ERR_FTP_PUT_CREATED @@ -1,6 +1,6 @@ - + FTP PUT Successful: File Created diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR index 6cb1a8ebd2..32a972d69f 100644 --- a/errors/templates/ERR_FTP_PUT_ERROR +++ b/errors/templates/ERR_FTP_PUT_ERROR @@ -1,6 +1,6 @@ - + ERROR: FTP upload failed diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED index b4138c845c..6c4f708a52 100644 --- a/errors/templates/ERR_FTP_PUT_MODIFIED +++ b/errors/templates/ERR_FTP_PUT_MODIFIED @@ -1,6 +1,6 @@ - + FTP PUT Successful: File Updated diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE index 621e56d629..d697bc33aa 100644 --- a/errors/templates/ERR_FTP_UNAVAILABLE +++ b/errors/templates/ERR_FTP_UNAVAILABLE @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE index 3b7b9450e3..27eaed6238 100644 --- a/errors/templates/ERR_ICAP_FAILURE +++ b/errors/templates/ERR_ICAP_FAILURE @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ index 3a61aa86e8..18b644ce72 100644 --- a/errors/templates/ERR_INVALID_REQ +++ b/errors/templates/ERR_INVALID_REQ @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP index 23dfecb0f5..88084a4f1b 100644 --- a/errors/templates/ERR_INVALID_RESP +++ b/errors/templates/ERR_INVALID_RESP @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL index 652cb7841d..c0a07ee481 100644 --- a/errors/templates/ERR_INVALID_URL +++ b/errors/templates/ERR_INVALID_URL @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP index d322f684ec..126cfd41c4 100644 --- a/errors/templates/ERR_LIFETIME_EXP +++ b/errors/templates/ERR_LIFETIME_EXP @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY index bfdb7f1e0b..6a44957f12 100644 --- a/errors/templates/ERR_NO_RELAY +++ b/errors/templates/ERR_NO_RELAY @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS index 5a5cebb469..248da077f7 100644 --- a/errors/templates/ERR_ONLY_IF_CACHED_MISS +++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR index 7945872cef..273bacfa4b 100644 --- a/errors/templates/ERR_READ_ERROR +++ b/errors/templates/ERR_READ_ERROR @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT index 3333f2481c..85e77e6c28 100644 --- a/errors/templates/ERR_READ_TIMEOUT +++ b/errors/templates/ERR_READ_TIMEOUT @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL index 087f629d18..6fa00397f3 100644 --- a/errors/templates/ERR_SECURE_CONNECT_FAIL +++ b/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN index 46f17f6a4d..96281b32a4 100644 --- a/errors/templates/ERR_SHUTTING_DOWN +++ b/errors/templates/ERR_SHUTTING_DOWN @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE index 19012a9a0a..4a459bd606 100644 --- a/errors/templates/ERR_SOCKET_FAILURE +++ b/errors/templates/ERR_SOCKET_FAILURE @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG index 2995b26825..8241c5af37 100644 --- a/errors/templates/ERR_TOO_BIG +++ b/errors/templates/ERR_TOO_BIG @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ index 7598d2be23..fa6ca73de8 100644 --- a/errors/templates/ERR_UNSUP_REQ +++ b/errors/templates/ERR_UNSUP_REQ @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE index cd2228f1d7..6172122fd4 100644 --- a/errors/templates/ERR_URN_RESOLVE +++ b/errors/templates/ERR_URN_RESOLVE @@ -1,6 +1,6 @@ - + ERROR: The requested URN not be retrieved diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR index d47a0e222a..41d5f99e60 100644 --- a/errors/templates/ERR_WRITE_ERROR +++ b/errors/templates/ERR_WRITE_ERROR @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT index 3f8579fae8..1dac029835 100644 --- a/errors/templates/ERR_ZERO_SIZE_OBJECT +++ b/errors/templates/ERR_ZERO_SIZE_OBJECT @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved diff --git a/errors/templates/generic b/errors/templates/generic index ed5e8b7d2a..4ee05eca71 100644 --- a/errors/templates/generic +++ b/errors/templates/generic @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved