diff -u -r -N squid-3.1.0.1/ChangeLog squid-3.1.0.2/ChangeLog
--- squid-3.1.0.1/ChangeLog 2008-10-28 03:29:32.000000000 +1300
+++ squid-3.1.0.2/ChangeLog 2008-11-10 00:22:14.000000000 +1300
@@ -1,3 +1,11 @@
+Changes to squid-3.1.0.2 (9 Nov 2008):
+
+ - Bug 2516: error page templates not properly installed
+ - Bug 2500: Solaris build issues
+ - Fixes FreeBSD build issues
+ - Release Notes completed
+ - Languages: new Russian, Japanese, Chinese, and general updates
+ - ... and other minor fixes
Changes to squid-3.1.0.1 (27 Oct 2008):
diff -u -r -N squid-3.1.0.1/configure squid-3.1.0.2/configure
--- squid-3.1.0.1/configure 2008-10-28 03:30:30.000000000 +1300
+++ squid-3.1.0.2/configure 2008-11-10 00:23:30.000000000 +1300
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Revision: 1.497 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.1.0.1.
+# Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.1.0.2.
#
# Report bugs to .
#
@@ -729,8 +729,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.1.0.1'
-PACKAGE_STRING='Squid Web Proxy 3.1.0.1'
+PACKAGE_VERSION='3.1.0.2'
+PACKAGE_STRING='Squid Web Proxy 3.1.0.2'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_unique_file="src/main.cc"
@@ -1522,7 +1522,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Squid Web Proxy 3.1.0.1 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1592,7 +1592,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.1.0.1:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.1.0.2:";;
esac
cat <<\_ACEOF
@@ -1914,7 +1914,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.1.0.1
+Squid Web Proxy configure 3.1.0.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1928,7 +1928,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 3.1.0.1, which was
+It was created by Squid Web Proxy $as_me 3.1.0.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2602,7 +2602,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.1.0.1'
+ VERSION='3.1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -21597,7 +21597,7 @@
yes)
for dir in $srcdir/src/fs/*; do
module="`basename $dir`"
- if test -d "$dir" && test "$module" != CVS; then
+ if test -d "$dir" && test "$module" != CVS && test "$module" != coss; then
STORE_MODULES="$STORE_MODULES $module"
fi
done
@@ -21697,17 +21697,37 @@
DISK_MODULES="$DISK_MODULES $module"
fi
done
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_DISKIO 1
+_ACEOF
+
;;
no)
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_DISKIO 0
+_ACEOF
+
;;
*)
DISK_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_DISKIO 1
+_ACEOF
+
;;
esac
else
if test -z "$DISK_MODULES"; then
DISK_MODULES="Blocking"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_DISKIO 1
+_ACEOF
+
fi
fi
@@ -21833,13 +21853,15 @@
fi
+
+REPL_POLICIES="lru"
# Check whether --enable-removal-policies was given.
if test "${enable_removal_policies+set}" = set; then
enableval=$enable_removal_policies; case $enableval in
yes)
for dir in $srcdir/src/repl/*; do
module="`basename $dir`"
- if test -d "$dir" && test "$module" != CVS; then
+ if test -d "$dir" && test "$module" != CVS && test "$module" != "lru"; then
REPL_POLICIES="$REPL_POLICIES $module"
fi
done
@@ -21851,11 +21873,6 @@
;;
esac
-else
- if test -z "$REPL_POLICIES"; then
- REPL_POLICIES="lru"
- fi
-
fi
if test -n "$REPL_POLICIES"; then
@@ -23221,14 +23238,12 @@
{ (exit 1); exit 1; }; }
fi
# Kerberos helper has its own configure system
- if test "$srcdir/helpers/negotiate_auth/$helper/configure" ; then
- if test $helper = squid_kerb_auth; then
- subdirs="$subdirs helpers/negotiate_auth/squid_kerb_auth"
-
- else
- echo "ERROR: configure.in needs to be extended to support $helper!"
- exit 1
- fi
+ if test "$helper" = "squid_kerb_auth"; then
+ subdirs="$subdirs helpers/negotiate_auth/squid_kerb_auth"
+
+ else
+ echo "ERROR: configure.in needs to be extended to support $helper!"
+ exit 1
fi
done
echo "Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS"
@@ -23692,6 +23707,14 @@
if test "$use_ipng" = "yes"; then
+ SAVED_LIBS="$LIBS"
+ case "$host" in
+ *-solaris*)
+ LIBS="$LIBS -lsocket"
+ ;;
+ *)
+ ;;
+ esac
{ echo "$as_me:$LINENO: checking if PF_INET6 is available" >&5
echo $ECHO_N "checking if PF_INET6 is available... $ECHO_C" >&6; }
if { as_var=$use_ipng; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -23744,6 +23767,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
use_ipng=yes
+ SAVED_LIBS="$LIBS"
else
echo "$as_me: program exited with status $ac_status" >&5
@@ -23765,6 +23789,7 @@
ac_res=`eval echo '${'$use_ipng'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
+ LIBS="$SAVED_LIBS"
fi
if test "$use_ipng" = "yes"; then
@@ -46632,7 +46657,7 @@
fi
-if test "$_SQUID_RES_NSADDR6_LIST" == ""; then
+if test "$_SQUID_RES_NSADDR6_LIST" = ""; then
{ echo "$as_me:$LINENO: checking for _res._u._ext.nsaddrs" >&5
echo $ECHO_N "checking for _res._u._ext.nsaddrs... $ECHO_C" >&6; }
if test "${ac_cv_have_res_ext_nsaddrs+set}" = set; then
@@ -46790,7 +46815,7 @@
fi
-if test "$_SQUID_RES_NSADDR_LIST" == ""; then
+if test "$_SQUID_RES_NSADDR_LIST" = ""; then
{ echo "$as_me:$LINENO: checking for _res.ns_list" >&5
echo $ECHO_N "checking for _res.ns_list... $ECHO_C" >&6; }
if test "${ac_cv_have_res_ns_list+set}" = set; then
@@ -47761,7 +47786,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 3.1.0.1, which was
+This file was extended by Squid Web Proxy $as_me 3.1.0.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -47814,7 +47839,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Squid Web Proxy config.status 3.1.0.1
+Squid Web Proxy config.status 3.1.0.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -u -r -N squid-3.1.0.1/configure.in squid-3.1.0.2/configure.in
--- squid-3.1.0.1/configure.in 2008-10-28 03:30:30.000000000 +1300
+++ squid-3.1.0.2/configure.in 2008-11-10 00:23:29.000000000 +1300
@@ -1,7 +1,7 @@
dnl Configuration input file for Squid
dnl
dnl
-AC_INIT(Squid Web Proxy, 3.1.0.1, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 3.1.0.2, http://www.squid-cache.org/bugs/, squid)
AC_PREREQ(2.52)
AM_CONFIG_HEADER(include/autoconf.h)
AC_CONFIG_AUX_DIR(cfgaux)
@@ -441,7 +441,7 @@
yes)
for dir in $srcdir/src/fs/*; do
module="`basename $dir`"
- if test -d "$dir" && test "$module" != CVS; then
+ if test -d "$dir" && test "$module" != CVS && test "$module" != coss; then
STORE_MODULES="$STORE_MODULES $module"
fi
done
@@ -552,16 +552,20 @@
DISK_MODULES="$DISK_MODULES $module"
fi
done
+ AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
;;
no)
+ AC_DEFINE(USE_DISKIO,0,[DiskIO modules are expected to be available.])
;;
*)
DISK_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`"
+ AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
;;
esac
],
[ if test -z "$DISK_MODULES"; then
DISK_MODULES="Blocking"
+ AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
fi
])
if test -n "$DISK_MODULES"; then
@@ -666,6 +670,11 @@
AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
AM_CONDITIONAL([USE_AIO_WIN32], [test "$USE_AIO_WIN32" = 1])
+
+dnl At lest one removal policy is always needed.
+dnl 'lru' removal policy is currently hard-coded by name for tests
+dnl so we must set it as default.
+REPL_POLICIES="lru"
AC_ARG_ENABLE(removal-policies,
AC_HELP_STRING([--enable-removal-policies="list of policies"],
[Build support for the list of removal policies.
@@ -677,7 +686,7 @@
yes)
for dir in $srcdir/src/repl/*; do
module="`basename $dir`"
- if test -d "$dir" && test "$module" != CVS; then
+ if test -d "$dir" && test "$module" != CVS && test "$module" != "lru"; then
REPL_POLICIES="$REPL_POLICIES $module"
fi
done
@@ -688,10 +697,6 @@
REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`"
;;
esac
-],
-[ if test -z "$REPL_POLICIES"; then
- REPL_POLICIES="lru"
- fi
])
if test -n "$REPL_POLICIES"; then
for module in $REPL_POLICIES; do
@@ -1622,13 +1627,11 @@
AC_MSG_ERROR(Negotiate Auth helper $helper does not exist)
fi
# Kerberos helper has its own configure system
- if test "$srcdir/helpers/negotiate_auth/$helper/configure" ; then
- if test $helper = squid_kerb_auth; then
- AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
- else
- echo "ERROR: configure.in needs to be extended to support $helper!"
- exit 1
- fi
+ if test "$helper" = "squid_kerb_auth"; then
+ AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
+ else
+ echo "ERROR: configure.in needs to be extended to support $helper!"
+ exit 1
fi
done
echo "Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS"
@@ -1875,6 +1878,15 @@
],[AC_MSG_RESULT(yes)])
if test "$use_ipng" = "yes"; then
+ SAVED_LIBS="$LIBS"
+ dnl Solaris 10/11 requires -lsocket
+ case "$host" in
+ *-solaris*)
+ LIBS="$LIBS -lsocket"
+ ;;
+ *)
+ ;;
+ esac
AC_CACHE_CHECK([if PF_INET6 is available], $use_ipng,
AC_TRY_RUN(
[ /* PF_INET6 available check */
@@ -1889,11 +1901,13 @@
],
[ AC_MSG_RESULT(yes)
use_ipng=yes
+ SAVED_LIBS="$LIBS"
],
[ AC_MSG_RESULT(no)
use_ipng=no
])
)
+ LIBS="$SAVED_LIBS"
fi
if test "$use_ipng" = "yes"; then
@@ -3622,7 +3636,7 @@
AC_DEFINE(_SQUID_RES_NSADDR6_COUNT,ns6count,[Nameserver Counter for IPv6 _res_ext])
fi
-if test "$_SQUID_RES_NSADDR6_LIST" == ""; then
+if test "$_SQUID_RES_NSADDR6_LIST" = ""; then
AC_CACHE_CHECK(for _res._u._ext.nsaddrs, ac_cv_have_res_ext_nsaddrs,
AC_TRY_COMPILE([
#if HAVE_SYS_TYPES_H
@@ -3676,7 +3690,7 @@
AC_DEFINE(_SQUID_RES_NSADDR_COUNT,_res.nscount,[Nameserver counter for IPv4 _res])
fi
-if test "$_SQUID_RES_NSADDR_LIST" == ""; then
+if test "$_SQUID_RES_NSADDR_LIST" = ""; then
AC_CACHE_CHECK(for _res.ns_list, ac_cv_have_res_ns_list,
AC_TRY_COMPILE([
#if HAVE_SYS_TYPES_H
diff -u -r -N squid-3.1.0.1/errors/bg/ERR_FTP_LISTING squid-3.1.0.2/errors/bg/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/bg/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/bg/ERR_FTP_LISTING 2008-11-10 00:25:04.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ca/ERR_FTP_LISTING squid-3.1.0.2/errors/ca/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/ca/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ca/ERR_FTP_LISTING 2008-11-10 00:25:10.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/cs/ERR_FTP_LISTING squid-3.1.0.2/errors/cs/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/cs/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/cs/ERR_FTP_LISTING 2008-11-10 00:25:16.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/da/ERR_FTP_LISTING squid-3.1.0.2/errors/da/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/da/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/da/ERR_FTP_LISTING 2008-11-10 00:25:23.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/de/ERR_FTP_LISTING squid-3.1.0.2/errors/de/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/de/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/de/ERR_FTP_LISTING 2008-11-10 00:25:28.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/de/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/de/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/de/ERR_FTP_PUT_CREATED 2008-10-28 03:32:11.000000000 +1300
+++ squid-3.1.0.2/errors/de/ERR_FTP_PUT_CREATED 2008-11-10 00:25:28.000000000 +1300
@@ -1 +1 @@
- FTP PUT Erfolgreich: Datei Erstellt
Operation Erfolgreich
Datei erstellt
\ No newline at end of file
+ FTP PUT Erfolgreich: Datei erstellt
Operation Erfolgreich
Datei erstellt
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/en/ERR_FTP_LISTING squid-3.1.0.2/errors/en/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/en/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/en/ERR_FTP_LISTING 2008-11-10 00:25:34.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/en-au/ERR_FTP_LISTING squid-3.1.0.2/errors/en-au/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/en-au/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/en-au/ERR_FTP_LISTING 2008-11-10 00:25:39.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/en-gb/ERR_FTP_LISTING squid-3.1.0.2/errors/en-gb/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/en-gb/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/en-gb/ERR_FTP_LISTING 2008-11-10 00:25:44.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/en-nz/ERR_FTP_LISTING squid-3.1.0.2/errors/en-nz/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/en-nz/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/en-nz/ERR_FTP_LISTING 2008-11-10 00:25:50.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/en-us/ERR_FTP_LISTING squid-3.1.0.2/errors/en-us/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/en-us/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/en-us/ERR_FTP_LISTING 2008-11-10 00:25:55.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/errorpage.css squid-3.1.0.2/errors/errorpage.css
--- squid-3.1.0.1/errors/errorpage.css 2008-10-28 03:33:27.000000000 +1300
+++ squid-3.1.0.2/errors/errorpage.css 2008-11-10 00:27:01.000000000 +1300
@@ -66,6 +66,16 @@
font-family:sans-serif;
}
+/* special event: FTP directory listing */
+#ftplisting tr.entry td.icon,td.filename,td.size,td.date {
+ border-bottom: groove;
+}
+#ftplisting td.size {
+ width: 50px;
+ text-align: right;
+ padding-right: 5px;
+}
+
/* horizontal lines */
hr {
margin: 0;
diff -u -r -N squid-3.1.0.1/errors/es/ERR_FTP_LISTING squid-3.1.0.2/errors/es/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/es/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/es/ERR_FTP_LISTING 2008-11-10 00:26:00.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/fr/ERR_FTP_LISTING squid-3.1.0.2/errors/fr/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/fr/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/fr/ERR_FTP_LISTING 2008-11-10 00:26:06.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/id/ERR_ACCESS_DENIED squid-3.1.0.2/errors/id/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/id/ERR_ACCESS_DENIED 2008-10-28 03:32:48.000000000 +1300
+++ squid-3.1.0.2/errors/id/ERR_ACCESS_DENIED 2008-11-10 00:26:09.000000000 +1300
@@ -1 +1 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Akses Ditolak
Akses kontrol konfigurasi mencegah permintaan Anda tidak diizinkan untuk saat ini. Silahkan hubungi operator servis jika Anda merasa ini tidak benar.
Your cache administrator is %w.
\ No newline at end of file
+ ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Akses Ditolak
Konfigurasi kontrol akses mencegah permintaan anda dibolehkan pada waktu ini. Coba hubungi pamong servis anda jika anda merasa ini salah.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/id/ERR_FTP_LISTING squid-3.1.0.2/errors/id/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/id/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/id/ERR_FTP_LISTING 2008-11-10 00:26:11.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/it/ERR_FTP_LISTING squid-3.1.0.2/errors/it/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/it/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/it/ERR_FTP_LISTING 2008-11-10 00:26:17.000000000 +1300
@@ -0,0 +1 @@
+ Directory FTP: %U
Contenuto della Directory:
%z
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_ACCESS_DENIED squid-3.1.0.2/errors/ja/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/ja/ERR_ACCESS_DENIED 2008-10-28 03:32:58.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_ACCESS_DENIED 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
アクセスを拒否されました。
設定されているアクセス制御の設定のため、今回はあなたからのリクエストは受けつけられません。この設定が正しくないと思われる場合には、このサービスの提供者へ連絡してください。
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
アクセスを拒否されました。
設定されているアクセス制御の設定のため、今回はあなたからのリクエストは受けつけられません。この設定が正しくないと思われる場合には、このサービスの提供者へ連絡してください。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_CACHE_ACCESS_DENIED squid-3.1.0.2/errors/ja/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.1/errors/ja/ERR_CACHE_ACCESS_DENIED 2008-10-28 03:32:58.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_CACHE_ACCESS_DENIED 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: Cache Access Denied
ERROR
Cache アクセスを拒否されました。
The following error was encountered while trying to retrieve the URL: %U
キャッシュへのアクセスを拒否されました．
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or change your default password.
\ No newline at end of file
+ エラー: Cache Access Denied
ERROR
Cache アクセスを拒否されました。
The following error was encountered while trying to retrieve the URL: %U
キャッシュへのアクセスを拒否されました．
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or change your default password.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.2/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.1/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 2008-10-28 03:32:58.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: Cache Manager Access Denied
ERROR
Cache Manager アクセスを拒否されました。
The following error was encountered while trying to retrieve the URL: %U
キャッシュマネジャへのアクセスを拒否されました．
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.
\ No newline at end of file
+ エラー: Cache Manager Access Denied
ERROR
Cache Manager アクセスを拒否されました。
The following error was encountered while trying to retrieve the URL: %U
キャッシュマネジャへのアクセスを拒否されました．
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_CANNOT_FORWARD squid-3.1.0.2/errors/ja/ERR_CANNOT_FORWARD
--- squid-3.1.0.1/errors/ja/ERR_CANNOT_FORWARD 2008-10-28 03:32:58.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_CANNOT_FORWARD 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to forward this request at this time.
This request could not be forwarded to the origin server or to any parent caches. The most likely cause for this error is that the cache administrator does not allow this cache to make direct connections to origin servers, and all configured parent caches are currently unreachable.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to forward this request at this time.
This request could not be forwarded to the origin server or to any parent caches. The most likely cause for this error is that the cache administrator does not allow this cache to make direct connections to origin servers, and all configured parent caches are currently unreachable.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_CONNECT_FAIL squid-3.1.0.2/errors/ja/ERR_CONNECT_FAIL
--- squid-3.1.0.1/errors/ja/ERR_CONNECT_FAIL 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_CONNECT_FAIL 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%I への接続に失敗しました。
The system returned: %E
The remote host or network may be down. Please try the request again.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%I への接続に失敗しました。
The system returned: %E
The remote host or network may be down. Please try the request again.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_DNS_FAIL squid-3.1.0.2/errors/ja/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/ja/ERR_DNS_FAIL 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_DNS_FAIL 2008-11-10 00:26:21.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to determine IP address from host name %H
The DNS server returned:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to determine IP address from host name %H
The DNS server returned:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_ESI squid-3.1.0.2/errors/ja/ERR_ESI
--- squid-3.1.0.1/errors/ja/ERR_ESI 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_ESI 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESIの処理に失敗しました。
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESIの処理に失敗しました。
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FORWARDING_DENIED squid-3.1.0.2/errors/ja/ERR_FORWARDING_DENIED
--- squid-3.1.0.1/errors/ja/ERR_FORWARDING_DENIED 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FORWARDING_DENIED 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Forwarding Denied.
This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
転送は拒否されました。
This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_DISABLED squid-3.1.0.2/errors/ja/ERR_FTP_DISABLED
--- squid-3.1.0.1/errors/ja/ERR_FTP_DISABLED 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_DISABLED 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTPは無効です。
This cache does not support FTP.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTPは無効です。
This cache does not support FTP.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_FAILURE squid-3.1.0.2/errors/ja/ERR_FTP_FAILURE
--- squid-3.1.0.1/errors/ja/ERR_FTP_FAILURE 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_FAILURE 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTPのプロトコル・エラーが、以下のURLから情報を得ようとしている間に発生しました: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTPのプロトコル・エラーが、以下のURLから情報を得ようとしている間に発生しました: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_FORBIDDEN squid-3.1.0.2/errors/ja/ERR_FTP_FORBIDDEN
--- squid-3.1.0.1/errors/ja/ERR_FTP_FORBIDDEN 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_FORBIDDEN 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTP認証の失敗が、以下のURLから情報を得ようとしている間に発生しました: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTP認証の失敗が、以下のURLから情報を得ようとしている間に発生しました: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_LISTING squid-3.1.0.2/errors/ja/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/ja/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ja/ERR_FTP_LISTING 2008-11-10 00:26:22.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_NOT_FOUND squid-3.1.0.2/errors/ja/ERR_FTP_NOT_FOUND
--- squid-3.1.0.1/errors/ja/ERR_FTP_NOT_FOUND 2008-10-28 03:32:59.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_NOT_FOUND 2008-11-10 00:26:22.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/ja/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/ja/ERR_FTP_PUT_CREATED 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_PUT_CREATED 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- FTPのPUTに成功: ファイルを作成しました。
Operation successful
ファイルを作成しました。
\ No newline at end of file
+ FTPのPUTに成功: ファイルを作成しました。
操作に成功
ファイルを作成しました。
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_PUT_ERROR squid-3.1.0.2/errors/ja/ERR_FTP_PUT_ERROR
--- squid-3.1.0.1/errors/ja/ERR_FTP_PUT_ERROR 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_PUT_ERROR 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- エラー: FTP upload failed
ERROR
ファイルのPUTやアップロードに失敗
While trying to PUT the following URL: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: FTP upload failed
ERROR
ファイルのPUTやアップロードに失敗
While trying to PUT the following URL: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/ja/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/ja/ERR_FTP_PUT_MODIFIED 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_PUT_MODIFIED 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- FTPのPUTに成功: ファイルを更新しました。
Operation successful
ファイルを更新しました。
\ No newline at end of file
+ FTPのPUTに成功: ファイルを更新しました。
操作に成功
ファイルを更新しました。
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_FTP_UNAVAILABLE squid-3.1.0.2/errors/ja/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.1/errors/ja/ERR_FTP_UNAVAILABLE 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_FTP_UNAVAILABLE 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_ICAP_FAILURE squid-3.1.0.2/errors/ja/ERR_ICAP_FAILURE
--- squid-3.1.0.1/errors/ja/ERR_ICAP_FAILURE 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_ICAP_FAILURE 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAP protocol error.
The system returned: %E
This means that some aspect of the ICAP communication failed.
Some possible problems are:
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAPのプロトコル・エラーです。
The system returned: %E
This means that some aspect of the ICAP communication failed.
Some possible problems are:
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_INVALID_REQ squid-3.1.0.2/errors/ja/ERR_INVALID_REQ
--- squid-3.1.0.1/errors/ja/ERR_INVALID_REQ 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_INVALID_REQ 2008-11-10 00:26:23.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
POSTまたはPUTのリクエストにContent-Lengthヘッダがありません。
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
Some possible problems are:
要求の方法が抜けているか不明です。
URLがありません。
HTTPの識別子(HTTP/1.0)がありません。
Request is too large.
POSTまたはPUTのリクエストにContent-Lengthヘッダがありません。
ホスト名に不正な文字が使われています: アンダースコアは使えません。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_INVALID_RESP squid-3.1.0.2/errors/ja/ERR_INVALID_RESP
--- squid-3.1.0.1/errors/ja/ERR_INVALID_RESP 2008-10-28 03:33:00.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_INVALID_RESP 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_INVALID_URL squid-3.1.0.2/errors/ja/ERR_INVALID_URL
--- squid-3.1.0.1/errors/ja/ERR_INVALID_URL 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_INVALID_URL 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Invalid URL
Some aspect of the requested URL is incorrect.
Some possible problems are:
Missing or incorrect access protocol (should be http://
or similar)
Missing hostname
Illegal double-escape in the URL-Path
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
不正なURL
Some aspect of the requested URL is incorrect.
Some possible problems are:
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_LIFETIME_EXP squid-3.1.0.2/errors/ja/ERR_LIFETIME_EXP
--- squid-3.1.0.1/errors/ja/ERR_LIFETIME_EXP 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_LIFETIME_EXP 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
接続の存続時間が終了しました。
Squid has terminated the request because it has exceeded the maximum connection lifetime.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
接続の存続時間が終了しました。
Squid has terminated the request because it has exceeded the maximum connection lifetime.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_NO_RELAY squid-3.1.0.2/errors/ja/ERR_NO_RELAY
--- squid-3.1.0.1/errors/ja/ERR_NO_RELAY 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_NO_RELAY 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
No Wais Relay
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Waisの中継先が指定されていません。
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.2/errors/ja/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.1/errors/ja/ERR_ONLY_IF_CACHED_MISS 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_ONLY_IF_CACHED_MISS 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Valid document was not found in the cache and only-if-cached
directive was specified.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Valid document was not found in the cache and only-if-cached
directive was specified.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_READ_ERROR squid-3.1.0.2/errors/ja/ERR_READ_ERROR
--- squid-3.1.0.1/errors/ja/ERR_READ_ERROR 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_READ_ERROR 2008-11-10 00:26:24.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Error
The system returned: %E
ネットワークからデータを受信している間にエラーが発生しました。再度、リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Error
The system returned: %E
ネットワークからデータを受信している間にエラーが発生しました。再度、リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_READ_TIMEOUT squid-3.1.0.2/errors/ja/ERR_READ_TIMEOUT
--- squid-3.1.0.1/errors/ja/ERR_READ_TIMEOUT 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_READ_TIMEOUT 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Timeout
The system returned: %E
ネットワークからデータを読もうと待っている間にタイムアウトが発生しました。ネットワークもしくはサーバが稼働していないか、あるいは混雑しています。再度リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Timeout
The system returned: %E
ネットワークからデータを読もうと待っている間にタイムアウトが発生しました。ネットワークもしくはサーバが稼働していないか、あるいは混雑しています。再度リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_SECURE_CONNECT_FAIL squid-3.1.0.2/errors/ja/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.1/errors/ja/ERR_SECURE_CONNECT_FAIL 2008-10-28 03:33:01.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_SECURE_CONNECT_FAIL 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%Iへの安全な接続を確立に失敗しました。
The system returned: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%Iへの安全な接続を確立に失敗しました。
The system returned: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_SHUTTING_DOWN squid-3.1.0.2/errors/ja/ERR_SHUTTING_DOWN
--- squid-3.1.0.1/errors/ja/ERR_SHUTTING_DOWN 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_SHUTTING_DOWN 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_SOCKET_FAILURE squid-3.1.0.2/errors/ja/ERR_SOCKET_FAILURE
--- squid-3.1.0.1/errors/ja/ERR_SOCKET_FAILURE 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_SOCKET_FAILURE 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Socket Failure
The system returned: %E
Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Socket Failure
The system returned: %E
Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_TOO_BIG squid-3.1.0.2/errors/ja/ERR_TOO_BIG
--- squid-3.1.0.1/errors/ja/ERR_TOO_BIG 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_TOO_BIG 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
The request or reply is too large.
If you are making a POST or PUT request, then the item you are trying to upload is too large.
If you are making a GET request, then the item you are trying to download is too large.
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
The request or reply is too large.
POSTまたはPUTの要求をしていたなら、アップロードしていた対象が大きすぎます。
GETの要求をしていたなら、ダウンロードしようとしていた対象が大きすぎます。
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_UNSUP_REQ squid-3.1.0.2/errors/ja/ERR_UNSUP_REQ
--- squid-3.1.0.1/errors/ja/ERR_UNSUP_REQ 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_UNSUP_REQ 2008-11-10 00:26:25.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unsupported Request Method and Protocol
Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unsupported Request Method and Protocol
Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_URN_RESOLVE squid-3.1.0.2/errors/ja/ERR_URN_RESOLVE
--- squid-3.1.0.1/errors/ja/ERR_URN_RESOLVE 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_URN_RESOLVE 2008-11-10 00:26:26.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URN not be retrieved
ERROR
リクエストされたURNのURLを調べられませんでした。
The following error was encountered while trying to retrieve the URN: %U
URN の解決ができませんでした。
Hey, don't expect too much from URNs on %T :)
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URN not be retrieved
ERROR
リクエストされたURNのURLを調べられませんでした。
The following error was encountered while trying to retrieve the URN: %U
URN の解決ができませんでした。
やあ、%Tの時点でURNには多くを期待しないでください。:)
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_WRITE_ERROR squid-3.1.0.2/errors/ja/ERR_WRITE_ERROR
--- squid-3.1.0.1/errors/ja/ERR_WRITE_ERROR 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_WRITE_ERROR 2008-11-10 00:26:26.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Write Error
The system returned: %E
ネットワークにデータを送信している間にエラーが発生しました。再度リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Write Error
The system returned: %E
ネットワークにデータを送信している間にエラーが発生しました。再度リクエストしてください。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ja/ERR_ZERO_SIZE_OBJECT squid-3.1.0.2/errors/ja/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.1/errors/ja/ERR_ZERO_SIZE_OBJECT 2008-10-28 03:33:02.000000000 +1300
+++ squid-3.1.0.2/errors/ja/ERR_ZERO_SIZE_OBJECT 2008-11-10 00:26:26.000000000 +1300
@@ -1 +1 @@
- エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Zero Sized Reply
Squid did not receive any data for this request.
Your cache administrator is %w.
\ No newline at end of file
+ エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Zero Sized Reply
Squid did not receive any data for this request.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/Makefile.am squid-3.1.0.2/errors/Makefile.am
--- squid-3.1.0.1/errors/Makefile.am 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Makefile.am 2008-11-10 00:22:16.000000000 +1300
@@ -27,6 +27,7 @@
ja \
nl \
pt-br \
+ ru \
sv \
uk \
zh-cn
@@ -48,8 +49,6 @@
Polish \
Portuguese \
Romanian \
- Russian-1251 \
- Russian-koi8-r \
Serbian \
Simplify_Chinese \
Slovak \
@@ -123,22 +122,22 @@
fi
dist-hook:
- for lang in $(LANGUAGES); do \
+ for lang in $(LANGUAGES) templates; do \
if test -d $(srcdir)/$$lang ; then \
- test -d $(distdir)/$$lang \
- || mkdir $(distdir)/$$lang \
- || exit 1; \
- cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
- || exit 1; \
+ test -d $(distdir)/$$lang \
+ || mkdir $(distdir)/$$lang \
+ || exit 1; \
+ cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
+ || exit 1; \
fi; \
done; \
$(MAKE) translate; \
for lang in $(TRANSLATIONS); do \
- if test -d $(srcdir)/$$lang ; then \
+ if test -d $$lang ; then \
test -d $(distdir)/$$lang \
|| mkdir $(distdir)/$$lang \
|| exit 1; \
- cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
+ cp -p $$lang/ERR_* $(distdir)/$$lang \
|| exit 1; \
fi; \
done; \
diff -u -r -N squid-3.1.0.1/errors/Makefile.in squid-3.1.0.2/errors/Makefile.in
--- squid-3.1.0.1/errors/Makefile.in 2008-10-28 03:29:55.000000000 +1300
+++ squid-3.1.0.2/errors/Makefile.in 2008-11-10 00:22:51.000000000 +1300
@@ -300,6 +300,7 @@
ja \
nl \
pt-br \
+ ru \
sv \
uk \
zh-cn
@@ -322,8 +323,6 @@
Polish \
Portuguese \
Romanian \
- Russian-1251 \
- Russian-koi8-r \
Serbian \
Simplify_Chinese \
Slovak \
@@ -561,22 +560,22 @@
fi
dist-hook:
- for lang in $(LANGUAGES); do \
+ for lang in $(LANGUAGES) templates; do \
if test -d $(srcdir)/$$lang ; then \
- test -d $(distdir)/$$lang \
- || mkdir $(distdir)/$$lang \
- || exit 1; \
- cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
- || exit 1; \
+ test -d $(distdir)/$$lang \
+ || mkdir $(distdir)/$$lang \
+ || exit 1; \
+ cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
+ || exit 1; \
fi; \
done; \
$(MAKE) translate; \
for lang in $(TRANSLATIONS); do \
- if test -d $(srcdir)/$$lang ; then \
+ if test -d $$lang ; then \
test -d $(distdir)/$$lang \
|| mkdir $(distdir)/$$lang \
|| exit 1; \
- cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \
+ cp -p $$lang/ERR_* $(distdir)/$$lang \
|| exit 1; \
fi; \
done; \
diff -u -r -N squid-3.1.0.1/errors/nl/ERR_DNS_FAIL squid-3.1.0.2/errors/nl/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/nl/ERR_DNS_FAIL 2008-10-28 03:33:03.000000000 +1300
+++ squid-3.1.0.2/errors/nl/ERR_DNS_FAIL 2008-11-10 00:26:27.000000000 +1300
@@ -1 +1 @@
- FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Niet in staat om het IP adres te bepalen van de hostnaam %H
De dnsserver gaf als antwoord:
%z
Dit betekent dat de cache niet in staat was om de hostnaam uit de URL te herleiden. Controleer of de naam klopt.
De beheerder van deze cache is %w.
\ No newline at end of file
+ FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Niet in staat om het IP adres te bepalen van de hostnaam %H
De DNS server gaf als antwoord:
%z
Dit betekent dat de cache niet in staat was om de hostnaam uit de URL te herleiden. Controleer of de naam klopt.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/nl/ERR_FTP_LISTING squid-3.1.0.2/errors/nl/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/nl/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/nl/ERR_FTP_LISTING 2008-11-10 00:26:28.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/nl/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/nl/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/nl/ERR_FTP_PUT_MODIFIED 2008-10-28 03:33:05.000000000 +1300
+++ squid-3.1.0.2/errors/nl/ERR_FTP_PUT_MODIFIED 2008-11-10 00:26:29.000000000 +1300
@@ -1 +1 @@
- FTP PUT Succesvol: Bestand vernieuwd
Bewerking succesvol
Bestand vernieuwd
\ No newline at end of file
+ FTP PUT Succesvol: Bestand Vernieuwd
Bewerking succesvol
Bestand vernieuwd
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/pt-br/ERR_FTP_LISTING squid-3.1.0.2/errors/pt-br/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/pt-br/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/pt-br/ERR_FTP_LISTING 2008-11-10 00:26:34.000000000 +1300
@@ -0,0 +1 @@
+ Diretório FTP: %U
Conteúdo do diretório:
%z
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_ACCESS_DENIED squid-3.1.0.2/errors/ru/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/ru/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_ACCESS_DENIED 2008-11-10 00:26:37.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
В доступе отказано.
Настройка контроля доступа не даёт возможности выполнить Ваш запрос в настоящее время. Пожалуйста, свяжитесь с Вашим поставщиком услуг Интернет, если Вы считаете это неправильным.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_CACHE_ACCESS_DENIED squid-3.1.0.2/errors/ru/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.1/errors/ru/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_CACHE_ACCESS_DENIED 2008-11-10 00:26:37.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Cache Access Denied
ERROR
Cache В доступе отказано.
При получении URL %U произошла следующая ошибка
В доступе к кэшу отказано.
Извините, Вы не можете запросить %U из этого кэша до тех пор, пока не пройдёте идентификацию.
Пожалуйста свяжитесь с администратором кэша, если у Вас возникли проблемы с аутентификацией, либо смените Ваш пароль по умолчанию.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.2/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.1/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 2008-11-10 00:26:37.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Cache Manager Access Denied
ERROR
Cache Manager В доступе отказано.
При получении URL %U произошла следующая ошибка
В доступе к администратору кэша отказано.
Извините, Вы не можете запросить %U из системы управления кэша до тех пор, пока не пройдете идентификацию.
Пожалуйста свяжитесь с администратором кэша, если у Вас возникли проблемы с аутентификацией, если же Вы администратор, прочитайте документацию по интерфейсу управления кэшем и просмотрите лог-файл на предмет более детальных сообщений об ошибках.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_CANNOT_FORWARD squid-3.1.0.2/errors/ru/ERR_CANNOT_FORWARD
--- squid-3.1.0.1/errors/ru/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_CANNOT_FORWARD 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Невозможно перенаправить запрос в данное время.
Этот запрос не может быть перенаправлен ни к первичному серверу, ни к родительским кэшам. Наиболее вероятная причина этой ошибки в том, что администратор запретил прямые соединения к первычным серверам, а все указанные родительские кэши в данный момент недоступны.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_CONNECT_FAIL squid-3.1.0.2/errors/ru/ERR_CONNECT_FAIL
--- squid-3.1.0.1/errors/ru/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_CONNECT_FAIL 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Соединение с %I не удалось
Система вернула: %E
Удаленный узел или сеть могут быть недоступны. Пожалуйста, повторите запрос позже.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_DNS_FAIL squid-3.1.0.2/errors/ru/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/ru/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_DNS_FAIL 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Невозможно определить IP адрес из имени узла %H
Сервер DNS ответил:
%z
Это означает, что кэш не смог преобразовать имя узла в URL. Проверьте адрес на правильность.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_ESI squid-3.1.0.2/errors/ru/ERR_ESI
--- squid-3.1.0.1/errors/ru/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_ESI 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Обработка ESI не удалась.
Обработчик ESI ответил:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Ваш вебмастер: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FORWARDING_DENIED squid-3.1.0.2/errors/ru/ERR_FORWARDING_DENIED
--- squid-3.1.0.1/errors/ru/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FORWARDING_DENIED 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
В пересылке отказано
Этот кэш не будет пересылать Ваш запрос по причине установки взаимоотношений типа sibling. Скорее всего клиент %i - неправильно сконфигурированный кэш.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_DISABLED squid-3.1.0.2/errors/ru/ERR_FTP_DISABLED
--- squid-3.1.0.1/errors/ru/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_DISABLED 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
FTP отключен
Этот кэш не поддерживает FTP.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_FAILURE squid-3.1.0.2/errors/ru/ERR_FTP_FAILURE
--- squid-3.1.0.1/errors/ru/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_FAILURE 2008-11-10 00:26:38.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP протокола при попытке получить следующий URL (унифицированный указатель информационного ресурса): %U
Squid послал следующую FTP комманду:
%f
Сервер ответил:
%F
%g
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_FORBIDDEN squid-3.1.0.2/errors/ru/ERR_FTP_FORBIDDEN
--- squid-3.1.0.1/errors/ru/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_FORBIDDEN 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP идентификации при попытке получить URL (унифицированный указатель информационного ресурса): %U
Squid послал следующую FTP комманду:
%f
Сервер ответил:
%F
%g
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_LISTING squid-3.1.0.2/errors/ru/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/ru/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_LISTING 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_NOT_FOUND squid-3.1.0.2/errors/ru/ERR_FTP_NOT_FOUND
--- squid-3.1.0.1/errors/ru/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_NOT_FOUND 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Следующий URL не может быть получен: %U
Squid послал следующую FTP комманду:
%f
Сервер ответил:
%F
%g
Это может быть вызвано FTP URL c абсолютным путем (который не соответствует RFC 1738). Если эта причина верна, то файл можно найти на %B.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/ru/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/ru/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_PUT_CREATED 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ Операция FTP PUT завершилась успешно: файл создан
Операция завершилась успешно
Файл создан
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_PUT_ERROR squid-3.1.0.2/errors/ru/ERR_FTP_PUT_ERROR
--- squid-3.1.0.1/errors/ru/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_PUT_ERROR 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: FTP upload failed
ERROR
Операция FTP PUT (загрузка) не удалась
При попытке PUT следующего URL: %U
Squid послал следующую FTP комманду:
%f
Сервер ответил:
%F
Это означает, что FTP сервер может не иметь прав или свободного места для хранения файла. Проверьте путь, права, свободное место и повторите снова.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/ru/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/ru/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_PUT_MODIFIED 2008-11-10 00:26:39.000000000 +1300
@@ -0,0 +1 @@
+ Операция FTP PUT завершилась успешно: файл обновлен
Операция завершилась успешно
Файл обновлен
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_FTP_UNAVAILABLE squid-3.1.0.2/errors/ru/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.1/errors/ru/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_FTP_UNAVAILABLE 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Сервер FTP слишком нагружен, чтобы получить URL: %U
Squid послал следующую FTP комманду:
%f
Сервер ответил:
%F
%g
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_ICAP_FAILURE squid-3.1.0.2/errors/ru/ERR_ICAP_FAILURE
--- squid-3.1.0.1/errors/ru/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_ICAP_FAILURE 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Ошибка ICAP протокола.
Система вернула: %E
Это означает, что некоторые аспекты ICAP связи неудались.
Возможные проблемы:
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_INVALID_REQ squid-3.1.0.2/errors/ru/ERR_INVALID_REQ
--- squid-3.1.0.1/errors/ru/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_INVALID_REQ 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Ошибка неверный запрос при обработке запроса:
%R
Возможные проблемы:
Отсутствует или неизвестен метод запроса.
Отсутствует URL.
Отсутствует HTTP идентификатор (HTTP/1.0).
Запрос слишком велик.
Упещенный Content-Length в POST или PUT запросе.
Недопустимый символ в имени (hostname), подчеркивания запрещены.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_INVALID_RESP squid-3.1.0.2/errors/ru/ERR_INVALID_RESP
--- squid-3.1.0.1/errors/ru/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_INVALID_RESP 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Ошибка неверный ответ при обработке запроса:
%R
Ответ HTTP (HTTP Response message), полученный от сервера не может быть обработан или неверно сформирован. Пожалуйста, свяжитесь с оператором сервера.
Администратор вашего кэша, при необходимости, может предоставить Вам более подробную информацию о действительных причинах проблемы.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_INVALID_URL squid-3.1.0.2/errors/ru/ERR_INVALID_URL
--- squid-3.1.0.1/errors/ru/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_INVALID_URL 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Неверный URL
Некоторые параметры URL неверны
Возможные проблемы:
Отсутствет или неверено указан протокол (должен быть http://
или похожий)
Отсутствует имя узла (hostname)
Недопустимое двойное экранирование в пути URL (URL-Path)
Недопустимый символ в имени (hostname), подчеркивания запрещены.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_LIFETIME_EXP squid-3.1.0.2/errors/ru/ERR_LIFETIME_EXP
--- squid-3.1.0.1/errors/ru/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_LIFETIME_EXP 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Время жизни соединения истекло
Squid прервал запрос из-за превышения максимального времени соединения.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_NO_RELAY squid-3.1.0.2/errors/ru/ERR_NO_RELAY
--- squid-3.1.0.1/errors/ru/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_NO_RELAY 2008-11-10 00:26:40.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Wais Relay не определен
Для этого кэша не определен Wais Relay узел. Кричите на администратора.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.2/errors/ru/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.1/errors/ru/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_ONLY_IF_CACHED_MISS 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Действительный документ не найден в кэше и указана деректива only-if-cached
.
Вы сделали запрос с директивой управления кэшем only-if-cached
. Документ не был найден в кэше или он требует обновления, запрешенного директивой only-if-cached
.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_READ_ERROR squid-3.1.0.2/errors/ru/ERR_READ_ERROR
--- squid-3.1.0.1/errors/ru/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_READ_ERROR 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Ошибка при чтении
Система вернула: %E
При попытке чтения данных из сети произошла ошибка. Пожалуйста, повторите запрос.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_READ_TIMEOUT squid-3.1.0.2/errors/ru/ERR_READ_TIMEOUT
--- squid-3.1.0.1/errors/ru/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_READ_TIMEOUT 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Время ожидания при чтении истекло
Система вернула: %E
Превышено время ожидания ответа во время чтения данных из сети. Сеть или сервер не работают либо перегружены. Пожалуйста, повторите запрос.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_SECURE_CONNECT_FAIL squid-3.1.0.2/errors/ru/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.1/errors/ru/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_SECURE_CONNECT_FAIL 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Не удалось установить безопасное соединение с %I
Система вернула: %E
При обработке Вашего запроса этот кэш и удаленный узел не смогли выбрать взаимно удовлетворяющие настройки безопасности. Возможно удаленный узел не поддерживает безопасные соединения, или кэш не не удовлетворен аттестатом безопасности узла.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_SHUTTING_DOWN squid-3.1.0.2/errors/ru/ERR_SHUTTING_DOWN
--- squid-3.1.0.1/errors/ru/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_SHUTTING_DOWN 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Этот кэш в процессе завершения работы и не может выполнить Ваш запрос в настоящее время. Пожалуйста, повторите запрос через некторое время.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_SOCKET_FAILURE squid-3.1.0.2/errors/ru/ERR_SOCKET_FAILURE
--- squid-3.1.0.1/errors/ru/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_SOCKET_FAILURE 2008-11-10 00:26:41.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Ошибка сокета
Система вернула: %E
Squid не может создать TCP сокет, предположительно из-за большой нагрузки. Пожалуйста, повторите запрос.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_TOO_BIG squid-3.1.0.2/errors/ru/ERR_TOO_BIG
--- squid-3.1.0.1/errors/ru/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_TOO_BIG 2008-11-10 00:26:42.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Запрос или ответ слишком велик.
Если Вы делаете POST или PUT запросы, то закачиваемый объект слишком велик.
Если Вы делаете GET запрос, то скачиваемый объект слишком велик.
Эти ограничения установлены вышим интернет провайдером, который управляет этим кэшем. Пожалуйста, свяжитесь с ними, если Вы считаете это неправильным.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_UNSUP_REQ squid-3.1.0.2/errors/ru/ERR_UNSUP_REQ
--- squid-3.1.0.1/errors/ru/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_UNSUP_REQ 2008-11-10 00:26:42.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Неподдерживаемый метод запроса или протокол
Squid не поддерживает все методы запросов для всех протоколов. К примеру, для Gopher протокола Вы не можете выполнять запрос POST.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_URN_RESOLVE squid-3.1.0.2/errors/ru/ERR_URN_RESOLVE
--- squid-3.1.0.1/errors/ru/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_URN_RESOLVE 2008-11-10 00:26:42.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: The requested URN not be retrieved
ERROR
URL для запрошенного URN не может быть получен
При получении URN: %U произошла следующая ошибка
Невозможно определить URN
Не стоит ожидать чудес от URN-ов на %T :)
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_WRITE_ERROR squid-3.1.0.2/errors/ru/ERR_WRITE_ERROR
--- squid-3.1.0.1/errors/ru/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_WRITE_ERROR 2008-11-10 00:26:42.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Ошибка записи
Система вернула: %E
При попытке записи данных в сеть произошла ошибка. Пожалуйста, повторите запрос.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/ru/ERR_ZERO_SIZE_OBJECT squid-3.1.0.2/errors/ru/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.1/errors/ru/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/ru/ERR_ZERO_SIZE_OBJECT 2008-11-10 00:26:42.000000000 +1300
@@ -0,0 +1 @@
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла следующая ошибка
Пустой ответ (нулевой длины)
Squid не получил никаких данных в ответ на этот запрос.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_ACCESS_DENIED squid-3.1.0.2/errors/Russian-1251/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-1251/ERR_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
--
-
- .
-
-
-
- . ,
- , .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED squid-3.1.0.2/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,34 +0,0 @@
-
-
-: .
-
-
-
-
-
-
-
- URL:
-%U
-
- :
-
-
-
-, :
-
%U
- , .
-
-
-
- Netscape 2.0 , Microsoft Internet
-Explorer 3.0, HTTP/1.1 .
- ,
- ,
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.2/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,35 +0,0 @@
-
-
-:
-
-
-
-
-
-
-
- URL:
-%U
-
- :
-
-
-
-, :
-
%U
- , .
-
-
-
- Netscape 2.0 , Microsoft
-Internet
-Explorer 3.0, HTTP/1.1 .
- ,
- , ,
-
-- .
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_CANNOT_FORWARD squid-3.1.0.2/errors/Russian-1251/ERR_CANNOT_FORWARD
--- squid-3.1.0.1/errors/Russian-1251/ERR_CANNOT_FORWARD 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- -
--. :
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_CONNECT_FAIL squid-3.1.0.2/errors/Russian-1251/ERR_CONNECT_FAIL
--- squid-3.1.0.1/errors/Russian-1251/ERR_CONNECT_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- . , .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_DNS_FAIL squid-3.1.0.2/errors/Russian-1251/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/Russian-1251/ERR_DNS_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
- IP
-%H
-
-
-
-
- :
-
-%z
-
-
-
- :
-
- , URL.
- .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_ESI squid-3.1.0.2/errors/Russian-1251/ERR_ESI
--- squid-3.1.0.1/errors/Russian-1251/ERR_ESI 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-ESI Processing failed.
-
-
-
-The ESI processor returned:
-
-%Z
-
-
-
-This means that:
-
- The surrogate was not able to process the ESI template. Please report this error to the webmaster.
-
-Your webmaster is %w.
-This page is in english because a translation has not been made. If you are able to, please create a translation and contact the squid project to get it included.
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FORWARDING_DENIED squid-3.1.0.2/errors/Russian-1251/ERR_FORWARDING_DENIED
--- squid-3.1.0.1/errors/Russian-1251/ERR_FORWARDING_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
-
- sibling. %i - .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_DISABLED squid-3.1.0.2/errors/Russian-1251/ERR_FTP_DISABLED
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_DISABLED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- FTP.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_FAILURE squid-3.1.0.2/errors/Russian-1251/ERR_FTP_FAILURE
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- FTP URL:
-%U
-
- FTP:
-
- %f
-
-
-
- %F
-
-
- (
- RFC 1738). ,
- %B.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_FORBIDDEN squid-3.1.0.2/errors/Russian-1251/ERR_FTP_FORBIDDEN
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_FORBIDDEN 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_NOT_FOUND squid-3.1.0.2/errors/Russian-1251/ERR_FTP_NOT_FOUND
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_NOT_FOUND 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-The following URL could not be retrieved:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_CREATED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,11 +0,0 @@
-
-
-FTP PUT :
-
-
-
-
-
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_ERROR squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_ERROR
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-: FTP PUT/upload
-
-
-
-FTP PUT/upload .
-
-
- :
-%U
-
- FTP :
-
- %f
-
-
-
- %F
-
-
- :
-
- , , .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_PUT_MODIFIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,11 +0,0 @@
-
-
-FTP PUT :
-
-
- .
- .
-
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_FTP_UNAVAILABLE squid-3.1.0.2/errors/Russian-1251/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.1/errors/Russian-1251/ERR_FTP_UNAVAILABLE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-The FTP server was too busy while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_ICAP_FAILURE squid-3.1.0.2/errors/Russian-1251/ERR_ICAP_FAILURE
--- squid-3.1.0.1/errors/Russian-1251/ERR_ICAP_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-ICAP protocol error.
-
-
-
-
-The system returned:
-
%E
-
-
-This means that:
-Some aspect of the ICAP communication failed. Possible problems:
-
-- ICAP server is not reachable.
-
- Illegal response from ICAP server.
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_REQ squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_REQ
--- squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_REQ 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- :
-
-%R
-
-
- :
-
-
-
- HTTP . :
-
-- (GET, POST)
-
- URL
-
- HTTP (HTTP/1.0)
-
-
-
- Content-Length POST PUT
-
- ;
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_RESP squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_RESP
--- squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_RESP 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
--
-
-Invalid Response
-
-
-
-
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_URL squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_URL
--- squid-3.1.0.1/errors/Russian-1251/ERR_INVALID_URL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- URL . :
-
-- ( `http://''
-)
-
-
-
- URL-
-
- ;
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_LIFETIME_EXP squid-3.1.0.2/errors/Russian-1251/ERR_LIFETIME_EXP
--- squid-3.1.0.1/errors/Russian-1251/ERR_LIFETIME_EXP 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_NO_RELAY squid-3.1.0.2/errors/Russian-1251/ERR_NO_RELAY
--- squid-3.1.0.1/errors/Russian-1251/ERR_NO_RELAY 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- WAIS Relay.
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.2/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.1/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
--
-
-
-
only-if-cached.
-
-
-
-
- - only-if-cached.
- , ,
- only-if-cached.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_READ_ERROR squid-3.1.0.2/errors/Russian-1251/ERR_READ_ERROR
--- squid-3.1.0.1/errors/Russian-1251/ERR_READ_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- . ,
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_READ_TIMEOUT squid-3.1.0.2/errors/Russian-1251/ERR_READ_TIMEOUT
--- squid-3.1.0.1/errors/Russian-1251/ERR_READ_TIMEOUT 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- .
- . , .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_SECURE_CONNECT_FAIL squid-3.1.0.2/errors/Russian-1251/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.1/errors/Russian-1251/ERR_SECURE_CONNECT_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Failed to establish a secure connection to %I
-
-
-
-
-The system returned:
-
%E
-
-
-This proxy and the remote host failed to negotiate a mutually acceptable
-security settings for handling your request. It is possible that the remote
-host does not support secure connections, or the proxy is not satisfied with
-the host security credentials.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_SHUTTING_DOWN squid-3.1.0.2/errors/Russian-1251/ERR_SHUTTING_DOWN
--- squid-3.1.0.1/errors/Russian-1251/ERR_SHUTTING_DOWN 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_SOCKET_FAILURE squid-3.1.0.2/errors/Russian-1251/ERR_SOCKET_FAILURE
--- squid-3.1.0.1/errors/Russian-1251/ERR_SOCKET_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- TCP socket, -
-. , . -
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_TOO_BIG squid-3.1.0.2/errors/Russian-1251/ERR_TOO_BIG
--- squid-3.1.0.1/errors/Russian-1251/ERR_TOO_BIG 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-The request or reply is too large.
-
-
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-
-
-Your cache administrator is %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_UNSUP_REQ squid-3.1.0.2/errors/Russian-1251/ERR_UNSUP_REQ
--- squid-3.1.0.1/errors/Russian-1251/ERR_UNSUP_REQ 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
- , Gopher POST.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_URN_RESOLVE squid-3.1.0.2/errors/Russian-1251/ERR_URN_RESOLVE
--- squid-3.1.0.1/errors/Russian-1251/ERR_URN_RESOLVE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-: URN
-
-
-
-URL URN
-
-
- URN:
-%U
-
- :
-
--
-
- URL URL.
-(Cannot Resolve URN)
-
-
-
-
- %T ;)
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_WRITE_ERROR squid-3.1.0.2/errors/Russian-1251/ERR_WRITE_ERROR
--- squid-3.1.0.1/errors/Russian-1251/ERR_WRITE_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- . ,
-.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT squid-3.1.0.2/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.1/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_ACCESS_DENIED squid-3.1.0.2/errors/Russian-koi8-r/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
--
-
- .
-
-
-
- . ,
- , .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED squid-3.1.0.2/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,35 +0,0 @@
-
-
-
-: ݣ.
-
-
-
-
- ݣ
-
-
- URL:
-%U
-
- :
-
-
-
-, :
-
%U
- , ģ .
-
-
-
- Netscape 2.0 , Microsoft Internet
-Explorer 3.0, HTTP/1.1 .
- ,
- ,
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.2/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,36 +0,0 @@
-
-
-
-: ݣ
-
-
-
-
- ݣ
-
-
- URL:
-%U
-
- :
-
-
-
-, :
-
%U
- , ģ .
-
-
-
- Netscape 2.0 , Microsoft
-Internet
-Explorer 3.0, HTTP/1.1 .
- ,
- , ,
-
-- .
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_CANNOT_FORWARD squid-3.1.0.2/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_CANNOT_FORWARD 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- -
--. :
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_CONNECT_FAIL squid-3.1.0.2/errors/Russian-koi8-r/ERR_CONNECT_FAIL
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_CONNECT_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
-̣ . , .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_DNS_FAIL squid-3.1.0.2/errors/Russian-koi8-r/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_DNS_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,34 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
- IP
-%H
-
-
-
-
- :
-
-%z
-
-
-
- :
-
- , URL.
- .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_ESI squid-3.1.0.2/errors/Russian-koi8-r/ERR_ESI
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_ESI 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-ESI Processing failed.
-
-
-
-The ESI processor returned:
-
-%Z
-
-
-
-This means that:
-
- The surrogate was not able to process the ESI template. Please report this error to the webmaster.
-
-Your webmaster is %w.
-This page is in english because a translation has not been made. If you are able to, please create a translation and contact the squid project to get it included.
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FORWARDING_DENIED squid-3.1.0.2/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FORWARDING_DENIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
-
- sibling. %i - .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_DISABLED squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_DISABLED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_DISABLED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- FTP.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_FAILURE squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_FAILURE
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- FTP URL:
-%U
-
- FTP:
-
- %f
-
-
-
- %F
-
-
- ԣ (
- RFC 1738). ,
- %B.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-The following URL could not be retrieved:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-
-
-
-FTP PUT :
-
-
-
-
-
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
-: FTP PUT/upload
-
-
-
-FTP PUT/upload .
-
-
- :
-%U
-
- FTP :
-
- %f
-
-
-
- %F
-
-
- :
-
- , , .
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-
-
-
-FTP PUT : ̣
-
-
- .
- ̣.
-
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-The FTP server was too busy while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-%F
-%g
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_ICAP_FAILURE squid-3.1.0.2/errors/Russian-koi8-r/ERR_ICAP_FAILURE
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_ICAP_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-ICAP protocol error.
-
-
-
-
-The system returned:
-
%E
-
-
-This means that:
-Some aspect of the ICAP communication failed. Possible problems:
-
-- ICAP server is not reachable.
-
- Illegal response from ICAP server.
-
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_REQ squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_REQ
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_REQ 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,34 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- :
-
-%R
-
-
- :
-
-
-
- HTTP . :
-
-- (GET, POST)
-
- URL
-
- HTTP (HTTP/1.0)
-
-
-
- Content-Length POST PUT
-
- ; ޣ
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_RESP squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_RESP
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_RESP 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- :
-
-%R
-
-
- :
-
-
-
-HTTP ,
-. .
- -
- .
-
-
- -: %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_URL squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_URL
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_INVALID_URL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
-: URL
-
-
-
- URL .
-
-
- URL:
-%U
-
- :
-
-
-
- URL . :
-
-- ( `http://''
-)
-
-
-
- URL-
-
- ; ޣ
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_LIFETIME_EXP squid-3.1.0.2/errors/Russian-koi8-r/ERR_LIFETIME_EXP
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_LIFETIME_EXP 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_NO_RELAY squid-3.1.0.2/errors/Russian-koi8-r/ERR_NO_RELAY
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_NO_RELAY 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- ̣ WAIS Relay.
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.2/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
--
-
-
-
only-if-cached.
-
-
-
-
- - only-if-cached.
- , ,
-ݣ only-if-cached.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_READ_ERROR squid-3.1.0.2/errors/Russian-koi8-r/ERR_READ_ERROR
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_READ_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- . ,
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_READ_TIMEOUT squid-3.1.0.2/errors/Russian-koi8-r/ERR_READ_TIMEOUT
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_READ_TIMEOUT 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- .
- . , .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_SECURE_CONNECT_FAIL squid-3.1.0.2/errors/Russian-koi8-r/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_SECURE_CONNECT_FAIL 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Failed to establish a secure connection to %I
-
-
-
-
-The system returned:
-
%E
-
-
-This proxy and the remote host failed to negotiate a mutually acceptable
-security settings for handling your request. It is possible that the remote
-host does not support secure connections, or the proxy is not satisfied with
-the host security credentials.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_SHUTTING_DOWN squid-3.1.0.2/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_SHUTTING_DOWN 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_SOCKET_FAILURE squid-3.1.0.2/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_SOCKET_FAILURE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- TCP socket, -
-. , . -
- .
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_TOO_BIG squid-3.1.0.2/errors/Russian-koi8-r/ERR_TOO_BIG
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_TOO_BIG 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-ERROR: The requested URL could not be retrieved
-
-
-ERROR
-The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-The request or reply is too large.
-
-
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-
-
-Your cache administrator is %w.
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_UNSUP_REQ squid-3.1.0.2/errors/Russian-koi8-r/ERR_UNSUP_REQ
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_UNSUP_REQ 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
- , Gopher POST.
-
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_URN_RESOLVE squid-3.1.0.2/errors/Russian-koi8-r/ERR_URN_RESOLVE
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_URN_RESOLVE 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
-: URN
-
-
-
-URL URN
-
-
- URN:
-%U
-
- :
-
--
-
- URL URL.
-(Cannot Resolve URN)
-
-
-
-
- %T ;)
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_WRITE_ERROR squid-3.1.0.2/errors/Russian-koi8-r/ERR_WRITE_ERROR
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_WRITE_ERROR 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- :
-
%E
-
-
- . ,
-.
-
diff -u -r -N squid-3.1.0.1/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT squid-3.1.0.2/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.1/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT 2008-10-28 03:29:33.000000000 +1300
+++ squid-3.1.0.2/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-: URL
-
-
-
- URL
-
-
- URL:
-%U
-
- :
-
-
-
- .
-
diff -u -r -N squid-3.1.0.1/errors/sv/ERR_FTP_LISTING squid-3.1.0.2/errors/sv/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/sv/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/sv/ERR_FTP_LISTING 2008-11-10 00:26:44.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_ACCESS_DENIED squid-3.1.0.2/errors/templates/ERR_ACCESS_DENIED
--- squid-3.1.0.1/errors/templates/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_ACCESS_DENIED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Access Denied.
+
+
+
Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_CACHE_ACCESS_DENIED squid-3.1.0.2/errors/templates/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.1/errors/templates/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_CACHE_ACCESS_DENIED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: Cache Access Denied
+
+
+
+
+
ERROR
+Cache Access Denied.
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Cache Access Denied.
+
+
+
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
+
+
Please contact the cache administrator if you have difficulties authenticating yourself or change your default password.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.2/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.1/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,32 @@
+
+
+
+ERROR: Cache Manager Access Denied
+
+
+
+
ERROR
+Cache Manager Access Denied.
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Cache Manager Access Denied.
+
+
+
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
+
+
Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_CANNOT_FORWARD squid-3.1.0.2/errors/templates/ERR_CANNOT_FORWARD
--- squid-3.1.0.1/errors/templates/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_CANNOT_FORWARD 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Unable to forward this request at this time.
+
+
+
This request could not be forwarded to the origin server or to any parent caches. The most likely cause for this error is that the cache administrator does not allow this cache to make direct connections to origin servers, and all configured parent caches are currently unreachable.
+
+
Your cache administrator is %w.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_CONNECT_FAIL squid-3.1.0.2/errors/templates/ERR_CONNECT_FAIL
--- squid-3.1.0.1/errors/templates/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_CONNECT_FAIL 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,34 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Connection to %I failed.
+
+
+
The system returned: %E
+
+
The remote host or network may be down. Please try the request again.
+
+
Your cache administrator is %w.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_DNS_FAIL squid-3.1.0.2/errors/templates/ERR_DNS_FAIL
--- squid-3.1.0.1/errors/templates/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_DNS_FAIL 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,36 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Unable to determine IP address from host name %H
+
+
+
The DNS server returned:
+
+%z
+
+
+
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_ESI squid-3.1.0.2/errors/templates/ERR_ESI
--- squid-3.1.0.1/errors/templates/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_ESI 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,36 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+ESI Processing failed.
+
+
+
The ESI processor returned:
+
+%Z
+
+
+
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
+
+
Your webmaster is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FORWARDING_DENIED squid-3.1.0.2/errors/templates/ERR_FORWARDING_DENIED
--- squid-3.1.0.1/errors/templates/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FORWARDING_DENIED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,32 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Forwarding Denied.
+
+
+
This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.
+
+
Your cache administrator is %w.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_DISABLED squid-3.1.0.2/errors/templates/ERR_FTP_DISABLED
--- squid-3.1.0.1/errors/templates/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_DISABLED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,32 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+FTP is Disabled
+
+
+
This cache does not support FTP.
+
+
Your cache administrator is %w.
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_FAILURE squid-3.1.0.2/errors/templates/ERR_FTP_FAILURE
--- squid-3.1.0.1/errors/templates/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_FAILURE 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,36 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
An FTP protocol error occurred while trying to retrieve the URL: %U
+
+
Squid sent the following FTP command:
+
+%f
+
+
+
The server responded with:
+
+%F
+%g
+
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_FORBIDDEN squid-3.1.0.2/errors/templates/ERR_FTP_FORBIDDEN
--- squid-3.1.0.1/errors/templates/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_FORBIDDEN 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,36 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
An FTP authentication failure occurred while trying to retrieve the URL: %U
+
+
Squid sent the following FTP command:
+
+%f
+
+
+
The server responded with:
+
+%F
+%g
+
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_LISTING squid-3.1.0.2/errors/templates/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/templates/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_LISTING 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,35 @@
+
+
+
+FTP Directory: %U
+
+
+
+
+
+
+
Directory Content:
+
+
+%z
+
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_NOT_FOUND squid-3.1.0.2/errors/templates/ERR_FTP_NOT_FOUND
--- squid-3.1.0.1/errors/templates/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_NOT_FOUND 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,38 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following URL could not be retrieved: %U
+
+
Squid sent the following FTP command:
+
+%f
+
+
+
The server responded with:
+
+%F
+%g
+
+
+
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_PUT_CREATED squid-3.1.0.2/errors/templates/ERR_FTP_PUT_CREATED
--- squid-3.1.0.1/errors/templates/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_PUT_CREATED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,20 @@
+
+
+
+FTP PUT Successful: File Created
+
+
+
+
Operation successful
+File created
+
+
+
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_PUT_ERROR squid-3.1.0.2/errors/templates/ERR_FTP_PUT_ERROR
--- squid-3.1.0.1/errors/templates/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_PUT_ERROR 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,37 @@
+
+
+
+ERROR: FTP upload failed
+
+
+
+
ERROR
+FTP PUT/upload failed
+
+
+
+
+
While trying to PUT the following URL: %U
+
+
Squid sent the following FTP command:
+
+%f
+
+
+
The server responded with:
+
+%F
+
+
+
This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_PUT_MODIFIED squid-3.1.0.2/errors/templates/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.1/errors/templates/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_PUT_MODIFIED 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,20 @@
+
+
+
+FTP PUT Successful: File Updated
+
+
+
+
Operation successful
+File updated
+
+
+
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_FTP_UNAVAILABLE squid-3.1.0.2/errors/templates/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.1/errors/templates/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_FTP_UNAVAILABLE 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,37 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The FTP server was too busy to retrieve the URL: %U
+
+
Squid sent the following FTP command:
+
+
+%f
+
+
+
The server responded with:
+
+%F
+%g
+
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_ICAP_FAILURE squid-3.1.0.2/errors/templates/ERR_ICAP_FAILURE
--- squid-3.1.0.1/errors/templates/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_ICAP_FAILURE 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,38 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+ICAP protocol error.
+
+
+
The system returned: %E
+
+
This means that some aspect of the ICAP communication failed.
+
+
Some possible problems are:
+
+
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_INVALID_REQ squid-3.1.0.2/errors/templates/ERR_INVALID_REQ
--- squid-3.1.0.1/errors/templates/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_INVALID_REQ 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,39 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
Invalid Request error was encountered while trying to process the request:
+
+
+%R
+
+
+
Some possible problems are:
+
+Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_INVALID_RESP squid-3.1.0.2/errors/templates/ERR_INVALID_RESP
--- squid-3.1.0.1/errors/templates/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_INVALID_RESP 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
Invalid Response error was encountered while trying to process the request:
+
+
+%R
+
+
+
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
+
+
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_INVALID_URL squid-3.1.0.2/errors/templates/ERR_INVALID_URL
--- squid-3.1.0.1/errors/templates/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_INVALID_URL 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,39 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Invalid URL
+
+
+
Some aspect of the requested URL is incorrect.
+
+
Some possible problems are:
+
+Missing or incorrect access protocol (should be http://
or similar)
Missing hostname
Illegal double-escape in the URL-Path
Illegal character in hostname; underscores are not allowed.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_LIFETIME_EXP squid-3.1.0.2/errors/templates/ERR_LIFETIME_EXP
--- squid-3.1.0.1/errors/templates/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_LIFETIME_EXP 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Connection Lifetime Expired
+
+
+
Squid has terminated the request because it has exceeded the maximum connection lifetime.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_NO_RELAY squid-3.1.0.2/errors/templates/ERR_NO_RELAY
--- squid-3.1.0.1/errors/templates/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_NO_RELAY 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+No Wais Relay
+
+
+
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.2/errors/templates/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.1/errors/templates/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_ONLY_IF_CACHED_MISS 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Valid document was not found in the cache and only-if-cached
directive was specified.
+
+
+
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_READ_ERROR squid-3.1.0.2/errors/templates/ERR_READ_ERROR
--- squid-3.1.0.1/errors/templates/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_READ_ERROR 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Read Error
+
+
+
The system returned: %E
+
+
An error condition occurred while reading data from the network. Please retry your request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_READ_TIMEOUT squid-3.1.0.2/errors/templates/ERR_READ_TIMEOUT
--- squid-3.1.0.1/errors/templates/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_READ_TIMEOUT 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Read Timeout
+
+
+
The system returned: %E
+
+
A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_SECURE_CONNECT_FAIL squid-3.1.0.2/errors/templates/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.1/errors/templates/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_SECURE_CONNECT_FAIL 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Failed to establish a secure connection to %I
+
+
+
The system returned: %E
+
+
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_SHUTTING_DOWN squid-3.1.0.2/errors/templates/ERR_SHUTTING_DOWN
--- squid-3.1.0.1/errors/templates/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_SHUTTING_DOWN 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,27 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_SOCKET_FAILURE squid-3.1.0.2/errors/templates/ERR_SOCKET_FAILURE
--- squid-3.1.0.1/errors/templates/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_SOCKET_FAILURE 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Socket Failure
+
+
+
The system returned: %E
+
+
Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_TOO_BIG squid-3.1.0.2/errors/templates/ERR_TOO_BIG
--- squid-3.1.0.1/errors/templates/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_TOO_BIG 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+The request or reply is too large.
+
+
+
If you are making a POST or PUT request, then the item you are trying to upload is too large.
+
If you are making a GET request, then the item you are trying to download is too large.
+
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_UNSUP_REQ squid-3.1.0.2/errors/templates/ERR_UNSUP_REQ
--- squid-3.1.0.1/errors/templates/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_UNSUP_REQ 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Unsupported Request Method and Protocol
+
+
+
Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_URN_RESOLVE squid-3.1.0.2/errors/templates/ERR_URN_RESOLVE
--- squid-3.1.0.1/errors/templates/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_URN_RESOLVE 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URN not be retrieved
+
+
+
+
ERROR
+A URL for the requested URN could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URN: %U
+
+
+Cannot Resolve URN
+
+
+
Hey, don't expect too much from URNs on %T :)
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_WRITE_ERROR squid-3.1.0.2/errors/templates/ERR_WRITE_ERROR
--- squid-3.1.0.1/errors/templates/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_WRITE_ERROR 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,33 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Write Error
+
+
+
The system returned: %E
+
+
An error condition occurred while writing to the network. Please retry your request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/templates/ERR_ZERO_SIZE_OBJECT squid-3.1.0.2/errors/templates/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.1/errors/templates/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/templates/ERR_ZERO_SIZE_OBJECT 2008-11-10 00:22:17.000000000 +1300
@@ -0,0 +1,31 @@
+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
+
ERROR
+The requested URL could not be retrieved
+
+
+
+
+
The following error was encountered while trying to retrieve the URL: %U
+
+
+Zero Sized Reply
+
+
+
Squid did not receive any data for this request.
+
+
Your cache administrator is %w.
+
+
+
+
diff -u -r -N squid-3.1.0.1/errors/uk/ERR_FTP_LISTING squid-3.1.0.2/errors/uk/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/uk/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/uk/ERR_FTP_LISTING 2008-11-10 00:26:50.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/errors/zh-cn/ERR_FTP_LISTING squid-3.1.0.2/errors/zh-cn/ERR_FTP_LISTING
--- squid-3.1.0.1/errors/zh-cn/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.2/errors/zh-cn/ERR_FTP_LISTING 2008-11-10 00:26:55.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.1/include/autoconf.h.in squid-3.1.0.2/include/autoconf.h.in
--- squid-3.1.0.1/include/autoconf.h.in 2008-10-28 03:29:54.000000000 +1300
+++ squid-3.1.0.2/include/autoconf.h.in 2008-11-10 00:22:48.000000000 +1300
@@ -972,6 +972,9 @@
still semi-experimental. */
#undef USE_CACHE_DIGESTS
+/* DiskIO modules are expected to be available. */
+#undef USE_DISKIO
+
/* Use dnsserver processes instead of the internal DNS protocol support */
#undef USE_DNSSERVERS
diff -u -r -N squid-3.1.0.1/include/IPAddress.h squid-3.1.0.2/include/IPAddress.h
--- squid-3.1.0.1/include/IPAddress.h 2008-10-28 03:29:34.000000000 +1300
+++ squid-3.1.0.2/include/IPAddress.h 2008-11-10 00:22:18.000000000 +1300
@@ -72,8 +72,8 @@
* UPDATE: OpenBSD 4.3 has the same.
*/
#if USE_IPV6 && ( defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) )
-#define s6_addr8 __u6_addr.__u6_addr8
-#define s6_addr16 __u6_addr.__u6_addr16
+//#define s6_addr8 __u6_addr.__u6_addr8
+//#define s6_addr16 __u6_addr.__u6_addr16
#define s6_addr32 __u6_addr.__u6_addr32
#endif
@@ -82,6 +82,12 @@
#define IPV6_V6ONLY 27 // from OpenBSD 4.3 headers. (NP: does not match non-BSD OS values)
#endif
+/* Bug 2500: Solaris 10/11 require s6_addr* defines. */
+#if USE_IPV6 && defined(_SQUID_SOLARIS_)
+//#define s6_addr8 _S6_un._S6_u8
+//#define s6_addr16 _S6_un._S6_u16
+#define s6_addr32 _S6_un._S6_u32
+#endif
/// Length of buffer that needs to be allocated to old a null-terminated IP-string
// Yuck. But there are still structures that need it to be an 'integer constant'.
diff -u -r -N squid-3.1.0.1/include/version.h squid-3.1.0.2/include/version.h
--- squid-3.1.0.1/include/version.h 2008-10-28 03:30:30.000000000 +1300
+++ squid-3.1.0.2/include/version.h 2008-11-10 00:23:30.000000000 +1300
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1225117771
+#define SQUID_RELEASE_TIME 1226229722
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.1.0.1/RELEASENOTES.html squid-3.1.0.2/RELEASENOTES.html
--- squid-3.1.0.1/RELEASENOTES.html 2008-10-28 03:33:30.000000000 +1300
+++ squid-3.1.0.2/RELEASENOTES.html 2008-11-10 00:27:19.000000000 +1300
@@ -1,7 +1,7 @@
-
+
Squid 3.0.STABLE10 release notes
@@ -13,7 +13,52 @@
Squid is a WWW Cache application developed by the National Laboratory
for Applied Network Research and members of the Web Caching community.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
The Squid Team are pleased to announce the release of Squid-3.0.STABLE10.
This new release is available for download from
@@ -23,19 +68,19 @@
We welcome feedback and bug reports. If you find a bug, please see
http://wiki.squid-cache.org/SquidFaq/TroubleShooting#head-7067fc0034ce967e67911becaabb8c95a34d576d for how to submit a report with a stack trace.
-
+
Although this release is deemed good enough for use in many setups, please note the existence of
open bugs against Squid-3.0.
-
+
The 3.0 change history can be
viewed here.
-
+
-Squid 3.0 represents a major rewrite of Squid and has a number of new features.
@@ -87,7 +132,7 @@
More information about ESI can be found from the ESI website
http://www.esi.org
-Some of the features found in Squid-2.6 is not available in Squid-3.
@@ -107,7 +152,7 @@
-See
http://www.squid-cache.org/Doc/FAQ/FAQ-6.html#ss6.7 for a definition of all log types.
-
+
+
+
This Squid version can run on Windows as a system service using the Cygwin emulation environment,
or can be compiled in Windows native mode using the MinGW + MSYS development environment. Windows NT 4 SP4 and later are supported.
@@ -345,11 +392,11 @@
-
+
There have been many changes to Squid's configuration file since Squid-2.6.
-This section gives a thorough account of those changes in three categories:
+
+This section gives a detailed account of those changes in three categories:
-
@@ -362,10 +409,8 @@
-
-
-
-
New tags
+
@@ -384,6 +429,7 @@
+
- background_ping_rate
-
@@ -654,7 +700,8 @@
- Changes to existing tags
+
@@ -677,21 +724,7 @@
-Removed options:
-
- urlgroup=, not yet ported to Squid-3.
-
- no-connection-auth, not yet ported to Squid-3.
-
-
-
-- https_port
-
-
Removed options:
-
- urlgroup=, not yet ported to Squid-3.
-
-
-
+
- cache_peer
-
New options:
@@ -717,42 +750,13 @@
frequency of each parent being based on the round trip
time. Closer parents are used more often.
Usually used for background-ping parents.
-
-Removed options:
-
- monitorurl, monitorsize etc, not yet ported to Squid-3
- connection-auth=, not yet ported to Squid-3
-
-
-
- cache_dir
-
-
Common options
-
- no-store, replaces the older read-only option
-
- min-size, not yet ported to Squid-3
-
-
-
-COSS file system:
-
- The coss file store is experimental, and still lacks much
- of the functionality found in 2.6.
+Common options no-store, replaces the older read-only option
- overwrite-percent=n, not yet ported to Squid-3.
-
- max-stripe-waste=n, not yet ported to Squid-3.
-
- membufs=n, not yet ported to Squid-3.
-
- maxfullbufs=n, not yet ported to Squid-3.
-
-
-
- auth_param
-
Removed Basic auth option
@@ -761,12 +765,6 @@
-Removed digest options:
-
- concurrency, not yet ported to Squid-3.
-
-
-
- external_acl_type
-
New format specifications:
@@ -777,14 +775,6 @@
-Removed format specifications:
-
- %ACL, not yet ported to Squid-3
-
- %DATA, not yet ported to Squid-3
-
-
-
New result keywords:
tag= Apply a tag to a request (for both ERR and OK results)
@@ -817,17 +807,6 @@
New types:
acl aclname http_status 200 301 500- 400-403 ... # status code in reply
-
-
-
-
-Removed types:
-
- acl aclname urllogin [-i] [^a-zA-Z0-9] ... # regex matching on URL login field
-
- acl urlgroup group1 ...
- # match against the urlgroup as indicated by redirectors
-
@@ -906,7 +885,7 @@
allow/deny no longer used.
- url_rewrite_program
-
-
No urlgroup support in either requests or responese
+No urlgroup support in either requests or response
- auth_param
-
fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string.
@@ -915,45 +894,28 @@
-
-
-
- Removed tags
+
-- broken_vary_encoding
-
-
Not yet ported to Squid-3.
- - cache_vary
-
-
Not yet ported to Squid-3.
- - collapsed_forwarding
-
-
Not yet ported to Squid-3.
- - follow_x_forwarded_for
-
-
Not yet ported to Squid-3.
- - *_uses_indirect_client
-
-
Not yet ported to Squid-3.
- - error_map
-
-
Not yet ported to Squid-3.
- header_access
-
This has been replaced by request_header_access and reply_header_access
- - http_access2
-
-
Not yet ported to Squid-3.
+
- httpd_accel_no_pmtu_disc
-
Replaced by disable-pmtu-discovery http_port option
- - location_rewrite_*
-
-
Not yet ported to Squid-3.
- - refresh_stale_hit
-
-
Not yet ported to Squid-3.
+
- wais_relay_*
-
equivalent to cache_peer + cache_peer_access.
+
-
+
There have been some changes to Squid's build configuration since Squid-2.6.
+
This section gives an account of those changes in three categories:
- New options
+
@@ -1084,7 +1045,8 @@
- Changes to existing options
+
@@ -1127,25 +1089,8 @@
- Not yet available options
-
-These configure options have not yet been ported to Squid-3. If you need something to do then
-porting one of these from Squid-2 to Squid-3 is most welcome.
-
-
-- --enable-devpoll
-
-
Support for Solaris /dev/poll
-
- - --enable-select-simple
-
-
Basic POSIX select() loop without any binary fd_set optimizations.
-
- - --enable-follow-x-forwarded-for
-
-
Support following the X-Forwarded-For HTTP header for determining the
-client IP address
-
-
-
- Removed options
+
The following configure options have been removed.
@@ -1168,5 +1113,176 @@
+
+
+
+Some squid.conf and ./configure options which were available in Squid-2.7 are not yet available in Squid-3.0
+
+If you need something to do then porting one of these from Squid-2 to Squid-3 is most welcome.
+
+
+
+
+
+- acl
-
+
urllogin option not yet ported from 2.6
+urlgroup option not yet ported from 2.6
+
+ - acl_uses_indirect_client
-
+
Not yet ported from 2.6
+
+ - auth_param digest
-
+
concurrency option not yet ported from Squid-2
+
+ - authenticate_ip_shortcircuit_access
-
+
Not yet ported from 2.7
+
+ - authenticate_ip_shortcircuit_ttl
-
+
Not yet ported from 2.7
+
+ - broken_vary_encoding
-
+
Not yet ported from 2.6
+
+ - cache_dir
-
+
min-size option not yet ported from Squid-2
+COSS storage type is lacking stability fixes from 2.6
+COSS overwrite-percent= option not yet ported from 2.6
+COSS max-stripe-waste= option not yet ported from 2.6
+COSS membufs= option not yet ported from 2.6
+COSS maxfullbufs= option not yet ported from 2.6
+
+ - cache_peer
-
+
multicast-siblings not yet ported from 2.7
+idle= not yet ported from 2.7
+http11 not yet ported from 2.7
+connection-auth= not yet ported from 2.6
+monitorinterval= not yet ported from 2.6
+monitorsize= not yet ported from 2.6
+monitortimeout= not yet ported from 2.6
+monitorurl= not yet ported from 2.6
+
+ - cache_vary
-
+
Not yet ported from 2.6
+
+ - collapsed_forwarding
-
+
Not yet ported from 2.6
+
+ - delay_pool_uses_indirect_client
-
+
Not yet ported from 2.6
+
+ - error_map
-
+
Not yet ported from 2.6
+
+ - external_acl_type
-
+
%ACL format tag not yet ported from 2.6
+%DATA format tag not yet ported from 2.6
+
+ - external_refresh_check
-
+
Not yet ported from 2.7
+
+ - follow_x_forwarded_for
-
+
Not yet ported from 2.6
+
+ - http_access2
-
+
Not yet ported from 2.6
+
+ - http_port
-
+
act-as-origin not yet ported from 2.7
+allow-direct not yet ported from 2.7
+http11 not yet ported from 2.7
+urlgroup= not yet ported from 2.6
+no-connection-auth not yet ported from 2.6
+
+ - ignore_expect_100
-
+
Not yet ported from 2.7
+
+ - ignore_ims_on_miss
-
+
Not yet ported from 2.7
+
+ - location_rewrite_access
-
+
Not yet ported from 2.6
+
+ - location_rewrite_children
-
+
Not yet ported from 2.6
+
+ - location_rewrite_concurrency
-
+
Not yet ported from 2.6
+
+ - location_rewrite_program
-
+
Not yet ported from 2.6
+
+ - log_uses_indirect_client
-
+
Not yet ported from 2.6
+
+ - logfile_daemon
-
+
Not yet ported from 2.7
+
+ - logformat
-
+
%oa tag not yet ported from 2.7
+%sn tag not yet ported from 2.7
+
+ - max_filedescriptors
-
+
Not yet ported from 2.7
+
+ - max_stale
-
+
Not yet ported from 2.7
+
+ - refresh_pattern
-
+
stale-while-revalidate= not yet ported from 2.7
+ignore-stale-while-revalidate= not yet ported from 2.7
+max-stale= not yet ported from 2.7
+negative-ttl= not yet ported from 2.7
+
+ - refresh_stale_hit
-
+
Not yet ported from 2.7
+
+ - server_http11
-
+
Not yet ported from 2.7
+
+ - storeurl_access
-
+
Not yet ported from 2.7
+
+ - storeurl_rewrite_children
-
+
Not yet ported from 2.7
+
+ - storeurl_rewrite_concurrency
-
+
Not yet ported from 2.7
+
+ - storeurl_rewrite_program
-
+
Not yet ported from 2.7
+
+ - update_headers
-
+
Not yet ported from 2.7
+
+ - upgrade_http0.9
-
+
Not yet ported from 2.7
+
+ - zero_buffers
-
+
Not yet ported from 2.7
+
+
+
+
+
+
+
+
+- --enable-devpoll
-
+
Support for Solaris /dev/poll
+
+ - --enable-select-simple
-
+
Basic POSIX select() loop without any binary fd_set optimizations.
+
+ - --enable-follow-x-forwarded-for
-
+
Support following the X-Forwarded-For HTTP header for determining the
+client IP address
+
+ - --without-system-md5
-
+
+
+
+
diff -u -r -N squid-3.1.0.1/src/cf.data.pre squid-3.1.0.2/src/cf.data.pre
--- squid-3.1.0.1/src/cf.data.pre 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/cf.data.pre 2008-11-10 00:22:22.000000000 +1300
@@ -2147,6 +2147,10 @@
The coss store type:
+ NP: COSS filesystem in Squid-3 has been deemed too unstable for
+ production use and has thus been removed from this release.
+ We hope that it can be made usable again soon.
+
block-size=n defines the "block size" for COSS cache_dir's.
Squid uses file numbers as block numbers. Since file numbers
are limited to 24 bits, the block size determines the maximum
diff -u -r -N squid-3.1.0.1/src/fs/coss/coss-notes.txt squid-3.1.0.2/src/fs/coss/coss-notes.txt
--- squid-3.1.0.1/src/fs/coss/coss-notes.txt 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/coss-notes.txt 2008-11-10 00:22:23.000000000 +1300
@@ -1,5 +1,13 @@
COSS notes
+Amos Jeffries
+
+COSS Support is not stable yet in Squid-3. Please do not use.
+
+Any help porting the stability fixes from Squid 2.6 and 2.7
+is very welcome though to resolve this issue.
+
+
Adrian Chadd
$Id: coss-notes.txt,v 1.3 2003/08/27 21:19:38 wessels Exp $
diff -u -r -N squid-3.1.0.1/src/fs/coss/CossSwapDir.h squid-3.1.0.2/src/fs/coss/CossSwapDir.h
--- squid-3.1.0.1/src/fs/coss/CossSwapDir.h 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/CossSwapDir.h 2008-11-10 00:22:23.000000000 +1300
@@ -1,6 +1,4 @@
-/*
- * $Id$
- */
+#error COSS Support is not stable yet in Squid-3. Please do not use.
#ifndef __COSSSWAPDIR_H__
#define __COSSSWAPDIR_H__
diff -u -r -N squid-3.1.0.1/src/fs/coss/store_coss.h squid-3.1.0.2/src/fs/coss/store_coss.h
--- squid-3.1.0.1/src/fs/coss/store_coss.h 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/store_coss.h 2008-11-10 00:22:23.000000000 +1300
@@ -1,3 +1,4 @@
+#error COSS Support is not stable yet in Squid-3. Please do not use.
#ifndef __COSS_H__
#define __COSS_H__
diff -u -r -N squid-3.1.0.1/src/fs/coss/store_dir_coss.cc squid-3.1.0.2/src/fs/coss/store_dir_coss.cc
--- squid-3.1.0.1/src/fs/coss/store_dir_coss.cc 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/store_dir_coss.cc 2008-11-10 00:22:23.000000000 +1300
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable yet in Squid-3. Please do not use.
/*
* $Id: store_dir_coss.cc,v 1.77 2007/11/15 16:47:36 wessels Exp $
* vim: set et :
diff -u -r -N squid-3.1.0.1/src/fs/coss/StoreFScoss.cc squid-3.1.0.2/src/fs/coss/StoreFScoss.cc
--- squid-3.1.0.1/src/fs/coss/StoreFScoss.cc 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/StoreFScoss.cc 2008-11-10 00:22:23.000000000 +1300
@@ -1,4 +1,4 @@
-
+#error COSS Support is not stable yet in Squid-3. Please do not use.
/*
* $Id: StoreFScoss.cc,v 1.7 2006/09/03 21:05:21 hno Exp $
*
diff -u -r -N squid-3.1.0.1/src/fs/coss/StoreFScoss.h squid-3.1.0.2/src/fs/coss/StoreFScoss.h
--- squid-3.1.0.1/src/fs/coss/StoreFScoss.h 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/fs/coss/StoreFScoss.h 2008-11-10 00:22:23.000000000 +1300
@@ -1,3 +1,4 @@
+#error COSS Support is not stable yet in Squid-3. Please do not use.
/*
* $Id: StoreFScoss.h,v 1.4 2008/02/26 21:49:43 amosjeffries Exp $
*
diff -u -r -N squid-3.1.0.1/src/Makefile.am squid-3.1.0.2/src/Makefile.am
--- squid-3.1.0.1/src/Makefile.am 2008-10-28 03:29:38.000000000 +1300
+++ squid-3.1.0.2/src/Makefile.am 2008-11-10 00:22:21.000000000 +1300
@@ -978,6 +978,7 @@
DiskIO/Blocking/BlockingFile.h \
DiskIO/Blocking/BlockingIOStrategy.cc \
DiskIO/Blocking/BlockingIOStrategy.h \
+ DiskIO/Blocking/BlockingDiskIOModule.cc \
DiskIO/Blocking/BlockingDiskIOModule.h
libDiskDaemon_a_SOURCES = \
@@ -986,6 +987,7 @@
DiskIO/DiskDaemon/DiskdIOStrategy.cc \
DiskIO/DiskDaemon/DiskdIOStrategy.h \
DiskIO/DiskDaemon/diomsg.h \
+ DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \
DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
libDiskThreads_a_SOURCES = \
@@ -994,6 +996,7 @@
DiskIO/DiskThreads/DiskThreads.h \
DiskIO/DiskThreads/DiskThreadsDiskFile.cc \
DiskIO/DiskThreads/DiskThreadsDiskFile.h \
+ DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \
DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \
DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \
DiskIO/DiskThreads/DiskThreadsIOStrategy.h
@@ -1153,9 +1156,13 @@
## Special Universal .h dependency test script
## aborts if error encountered
-testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h
+testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h $(top_srcdir)/src/DiskIO/*/*.h
$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/AIO" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/Blocking" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskDaemon" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskThreads" || exit 1
## src/repl/ has no .h files and its own makefile.
## No such file...
@@ -2231,8 +2238,6 @@
SWAP_TEST_LDADD = \
libauth.la \
- DiskIO/Blocking/BlockingDiskIOModule.o \
- repl/lru/store_repl_lru.o \
@REGEXLIB@ \
@STORE_LINKOBJS@ \
@STORE_OBJS@ \
@@ -2242,8 +2247,6 @@
@SQUID_CPPUNIT_LIBS@
SWAP_TEST_DS =\
$(top_builddir)/lib/libmiscutil.a \
- DiskIO/Blocking/BlockingDiskIOModule.o \
- repl/lru/store_repl_lru.o \
repl_modules.o \
@DISK_LIBS@ \
@STORE_LINKOBJS@ \
diff -u -r -N squid-3.1.0.1/src/Makefile.in squid-3.1.0.2/src/Makefile.in
--- squid-3.1.0.1/src/Makefile.in 2008-10-28 03:30:07.000000000 +1300
+++ squid-3.1.0.2/src/Makefile.in 2008-11-10 00:23:07.000000000 +1300
@@ -100,12 +100,14 @@
libBlocking_a_AR = $(AR) $(ARFLAGS)
libBlocking_a_LIBADD =
am_libBlocking_a_OBJECTS = DiskIO/Blocking/BlockingFile.$(OBJEXT) \
- DiskIO/Blocking/BlockingIOStrategy.$(OBJEXT)
+ DiskIO/Blocking/BlockingIOStrategy.$(OBJEXT) \
+ DiskIO/Blocking/BlockingDiskIOModule.$(OBJEXT)
libBlocking_a_OBJECTS = $(am_libBlocking_a_OBJECTS)
libDiskDaemon_a_AR = $(AR) $(ARFLAGS)
libDiskDaemon_a_LIBADD =
am_libDiskDaemon_a_OBJECTS = DiskIO/DiskDaemon/DiskdFile.$(OBJEXT) \
- DiskIO/DiskDaemon/DiskdIOStrategy.$(OBJEXT)
+ DiskIO/DiskDaemon/DiskdIOStrategy.$(OBJEXT) \
+ DiskIO/DiskDaemon/DiskDaemonDiskIOModule.$(OBJEXT)
libDiskDaemon_a_OBJECTS = $(am_libDiskDaemon_a_OBJECTS)
libDiskThreads_a_AR = $(AR) $(ARFLAGS)
libDiskThreads_a_LIBADD =
@@ -115,6 +117,7 @@
DiskIO/DiskThreads/DiskThreads.h \
DiskIO/DiskThreads/DiskThreadsDiskFile.cc \
DiskIO/DiskThreads/DiskThreadsDiskFile.h \
+ DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \
DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \
DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \
DiskIO/DiskThreads/DiskThreadsIOStrategy.h
@@ -124,6 +127,7 @@
am_libDiskThreads_a_OBJECTS = $(am__objects_3) \
DiskIO/DiskThreads/async_io.$(OBJEXT) \
DiskIO/DiskThreads/DiskThreadsDiskFile.$(OBJEXT) \
+ DiskIO/DiskThreads/DiskThreadsDiskIOModule.$(OBJEXT) \
DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT)
libDiskThreads_a_OBJECTS = $(am_libDiskThreads_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -646,8 +650,7 @@
tests/testMain.$(OBJEXT) tests/stub_cache_manager.$(OBJEXT) \
$(am__objects_36)
tests_testCoss_OBJECTS = $(am_tests_testCoss_OBJECTS)
-am__DEPENDENCIES_2 = libauth.la DiskIO/Blocking/BlockingDiskIOModule.o \
- repl/lru/store_repl_lru.o
+am__DEPENDENCIES_2 = libauth.la
am__tests_testDiskIO_SOURCES_DIST = tests/stub_store_rebuild.cc \
tests/stub_internal.cc fd.cc disk.cc filemap.cc HttpBody.cc \
HttpReply.cc HttpStatusLine.cc int.cc list.cc MemObject.cc \
@@ -2435,6 +2438,7 @@
DiskIO/Blocking/BlockingFile.h \
DiskIO/Blocking/BlockingIOStrategy.cc \
DiskIO/Blocking/BlockingIOStrategy.h \
+ DiskIO/Blocking/BlockingDiskIOModule.cc \
DiskIO/Blocking/BlockingDiskIOModule.h
libDiskDaemon_a_SOURCES = \
@@ -2443,6 +2447,7 @@
DiskIO/DiskDaemon/DiskdIOStrategy.cc \
DiskIO/DiskDaemon/DiskdIOStrategy.h \
DiskIO/DiskDaemon/diomsg.h \
+ DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \
DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
libDiskThreads_a_SOURCES = \
@@ -2451,6 +2456,7 @@
DiskIO/DiskThreads/DiskThreads.h \
DiskIO/DiskThreads/DiskThreadsDiskFile.cc \
DiskIO/DiskThreads/DiskThreadsDiskFile.h \
+ DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \
DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \
DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \
DiskIO/DiskThreads/DiskThreadsIOStrategy.h
@@ -3558,8 +3564,6 @@
SWAP_TEST_LDADD = \
libauth.la \
- DiskIO/Blocking/BlockingDiskIOModule.o \
- repl/lru/store_repl_lru.o \
@REGEXLIB@ \
@STORE_LINKOBJS@ \
@STORE_OBJS@ \
@@ -3570,8 +3574,6 @@
SWAP_TEST_DS = \
$(top_builddir)/lib/libmiscutil.a \
- DiskIO/Blocking/BlockingDiskIOModule.o \
- repl/lru/store_repl_lru.o \
repl_modules.o \
@DISK_LIBS@ \
@STORE_LINKOBJS@ \
@@ -3845,6 +3847,9 @@
DiskIO/Blocking/BlockingIOStrategy.$(OBJEXT): \
DiskIO/Blocking/$(am__dirstamp) \
DiskIO/Blocking/$(DEPDIR)/$(am__dirstamp)
+DiskIO/Blocking/BlockingDiskIOModule.$(OBJEXT): \
+ DiskIO/Blocking/$(am__dirstamp) \
+ DiskIO/Blocking/$(DEPDIR)/$(am__dirstamp)
libBlocking.a: $(libBlocking_a_OBJECTS) $(libBlocking_a_DEPENDENCIES)
-rm -f libBlocking.a
$(libBlocking_a_AR) libBlocking.a $(libBlocking_a_OBJECTS) $(libBlocking_a_LIBADD)
@@ -3861,6 +3866,9 @@
DiskIO/DiskDaemon/DiskdIOStrategy.$(OBJEXT): \
DiskIO/DiskDaemon/$(am__dirstamp) \
DiskIO/DiskDaemon/$(DEPDIR)/$(am__dirstamp)
+DiskIO/DiskDaemon/DiskDaemonDiskIOModule.$(OBJEXT): \
+ DiskIO/DiskDaemon/$(am__dirstamp) \
+ DiskIO/DiskDaemon/$(DEPDIR)/$(am__dirstamp)
libDiskDaemon.a: $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_DEPENDENCIES)
-rm -f libDiskDaemon.a
$(libDiskDaemon_a_AR) libDiskDaemon.a $(libDiskDaemon_a_OBJECTS) $(libDiskDaemon_a_LIBADD)
@@ -3883,6 +3891,9 @@
DiskIO/DiskThreads/DiskThreadsDiskFile.$(OBJEXT): \
DiskIO/DiskThreads/$(am__dirstamp) \
DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp)
+DiskIO/DiskThreads/DiskThreadsDiskIOModule.$(OBJEXT): \
+ DiskIO/DiskThreads/$(am__dirstamp) \
+ DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp)
DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT): \
DiskIO/DiskThreads/$(am__dirstamp) \
DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp)
@@ -4068,15 +4079,6 @@
fs/ufs/$(DEPDIR)/$(am__dirstamp)
DiskIO/AIO/AIODiskIOModule.$(OBJEXT): DiskIO/AIO/$(am__dirstamp) \
DiskIO/AIO/$(DEPDIR)/$(am__dirstamp)
-DiskIO/Blocking/BlockingDiskIOModule.$(OBJEXT): \
- DiskIO/Blocking/$(am__dirstamp) \
- DiskIO/Blocking/$(DEPDIR)/$(am__dirstamp)
-DiskIO/DiskDaemon/DiskDaemonDiskIOModule.$(OBJEXT): \
- DiskIO/DiskDaemon/$(am__dirstamp) \
- DiskIO/DiskDaemon/$(DEPDIR)/$(am__dirstamp)
-DiskIO/DiskThreads/DiskThreadsDiskIOModule.$(OBJEXT): \
- DiskIO/DiskThreads/$(am__dirstamp) \
- DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp)
auth/basic/$(am__dirstamp):
@$(mkdir_p) auth/basic
@: > auth/basic/$(am__dirstamp)
@@ -5226,9 +5228,13 @@
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi
-testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h
+testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h $(top_srcdir)/src/DiskIO/*/*.h
$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/AIO" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/Blocking" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskDaemon" || exit 1
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskThreads" || exit 1
testHeaders.c:
touch testHeaders.c
diff -u -r -N squid-3.1.0.1/src/tests/testDiskIO.cc squid-3.1.0.2/src/tests/testDiskIO.cc
--- squid-3.1.0.1/src/tests/testDiskIO.cc 2008-10-28 03:29:39.000000000 +1300
+++ squid-3.1.0.2/src/tests/testDiskIO.cc 2008-11-10 00:22:23.000000000 +1300
@@ -8,7 +8,9 @@
#include "SwapDir.h"
#include "DiskIO/DiskIOModule.h"
#include "fs/ufs/ufscommon.h"
+#if 0 // AYJ: COSS in Squid-3 is disabled.
#include "fs/coss/CossSwapDir.h"
+#endif
#include "Mem.h"
#include "MemObject.h"
#include "HttpHeader.h"
@@ -29,5 +31,9 @@
testDiskIO::testFindDefault()
{
DiskIOModule * module = DiskIOModule::FindDefault();
+#if USE_DISKIO
CPPUNIT_ASSERT(module != NULL);
+#else
+ CPPUNIT_ASSERT(module == NULL);
+#endif
}
