UPDATE: Squid 2.6 STABLE18

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: Squid 2.6 STABLE18

Brad Smith-14
Here is an update to Squid 2.6 STABLE18.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile 4 Dec 2007 01:27:13 -0000 1.91
+++ Makefile 13 Jan 2008 04:22:51 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= WWW and FTP proxy cache and accelerator
 
-DISTNAME= squid-2.6.STABLE17
+DISTNAME= squid-2.6.STABLE18
 CATEGORIES= www
 MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/
 DIST_SUBDIR= squid
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo 4 Dec 2007 01:27:13 -0000 1.46
+++ distinfo 13 Jan 2008 04:23:15 -0000
@@ -1,5 +1,5 @@
-MD5 (squid/squid-2.6.STABLE17.tar.gz) = 8+XHch2fjY8l7LM39viLcw==
-RMD160 (squid/squid-2.6.STABLE17.tar.gz) = j63PanjA+M4gQm7Zp4g34ZoKmvY=
-SHA1 (squid/squid-2.6.STABLE17.tar.gz) = 5QIqkxjmVH1MJAnFn0V/kt5iBAE=
-SHA256 (squid/squid-2.6.STABLE17.tar.gz) = ASMffrCij6/0Hz8nm5SfMmAq5PzkHSb2GQ6YEv4qNgw=
-SIZE (squid/squid-2.6.STABLE17.tar.gz) = 1724676
+MD5 (squid/squid-2.6.STABLE18.tar.gz) = 1/9197dbp7wo6kU/5LlENA==
+RMD160 (squid/squid-2.6.STABLE18.tar.gz) = YlQsYHsqs2MM6Ch5sXUJtBIClHk=
+SHA1 (squid/squid-2.6.STABLE18.tar.gz) = uBnpNPB/9CGmM8J0MtfiifrTVo8=
+SHA256 (squid/squid-2.6.STABLE18.tar.gz) = UahfLa5Qp5Oh7TgZFnbL+asuzcBZME+/beBB02aS1jQ=
+SIZE (squid/squid-2.6.STABLE18.tar.gz) = 1725660

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: Squid 2.6 STABLE18

Rui Reis-2
On Sat, Jan 12, 2008 at 11:31:41PM -0500, Brad wrote:
> Here is an update to Squid 2.6 STABLE18.

brad@ has some reasons not to upgrade squid to 3.0 anytime soon... anyway
if you need 3.0 like me... try this one (delay pools are enabled by default,
they are broken before 3.0).


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.91
diff -u -r1.91 Makefile
--- Makefile 4 Dec 2007 01:27:13 -0000 1.91
+++ Makefile 12 Jan 2008 21:56:58 -0000
@@ -2,9 +2,9 @@
 
 COMMENT= WWW and FTP proxy cache and accelerator
 
-DISTNAME= squid-2.6.STABLE17
+DISTNAME= squid-3.0.STABLE1
 CATEGORIES= www
-MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/
+MASTER_SITES= ${HOMEPAGE}Versions/v3/3.0/
 DIST_SUBDIR= squid
 
 HOMEPAGE= http://www.squid-cache.org/
@@ -16,7 +16,7 @@
 PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto m pthread ssl
+WANTLIB= c crypto m pthread ssl stdc++
 
 SQUIDDIR?= /var/squid
 SUBST_VARS= SQUIDDIR
@@ -48,7 +48,8 @@
  --enable-storeio="aufs ufs diskd null" \
  --with-pthreads \
  --localstatedir="${SQUIDDIR}" \
- --enable-follow-x-forwarded-for
+ --enable-follow-x-forwarded-for \
+ --enable-delay-pools
 
 .if ${FLAVOR:L:Mtransparent}
 CONFIGURE_ARGS+=--enable-pf-transparent
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.46
diff -u -r1.46 distinfo
--- distinfo 4 Dec 2007 01:27:13 -0000 1.46
+++ distinfo 12 Jan 2008 21:56:58 -0000
@@ -1,5 +1,5 @@
-MD5 (squid/squid-2.6.STABLE17.tar.gz) = 8+XHch2fjY8l7LM39viLcw==
-RMD160 (squid/squid-2.6.STABLE17.tar.gz) = j63PanjA+M4gQm7Zp4g34ZoKmvY=
-SHA1 (squid/squid-2.6.STABLE17.tar.gz) = 5QIqkxjmVH1MJAnFn0V/kt5iBAE=
-SHA256 (squid/squid-2.6.STABLE17.tar.gz) = ASMffrCij6/0Hz8nm5SfMmAq5PzkHSb2GQ6YEv4qNgw=
-SIZE (squid/squid-2.6.STABLE17.tar.gz) = 1724676
+MD5 (squid/squid-3.0.STABLE1.tar.gz) = aI0Cra2bWSxZR9VCN/vAdg==
+RMD160 (squid/squid-3.0.STABLE1.tar.gz) = JBUkUpx1+HX7bHYNAjB20sn4LXs=
+SHA1 (squid/squid-3.0.STABLE1.tar.gz) = BX3YWii3EjA1qm96027A2YUIiUM=
+SHA256 (squid/squid-3.0.STABLE1.tar.gz) = a5LyWeyJ7MyrrwgeR/30AtN6PV0P+T3RtYb2NPzfuJE=
+SIZE (squid/squid-3.0.STABLE1.tar.gz) = 2406601
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-configure_in,v
retrieving revision 1.25
diff -u -r1.25 patch-configure_in
--- patches/patch-configure_in 10 Sep 2007 17:49:23 -0000 1.25
+++ patches/patch-configure_in 12 Jan 2008 21:56:58 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.25 2007/09/10 17:49:23 merdely Exp $
---- configure.in.orig Wed Sep  5 18:25:42 2007
-+++ configure.in Wed Sep  5 21:01:07 2007
-@@ -2248,18 +2248,6 @@ dnl during compile.
+$OpenBSD$
+--- configure.in.orig Fri Dec 14 00:25:27 2007
++++ configure.in Sat Jan 12 18:31:55 2008
+@@ -2409,18 +2409,6 @@ dnl Please change your configure script.  AIX doesn't
  ;;
  esac
 
Index: patches/patch-errors_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-errors_Makefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-errors_Makefile_in
--- patches/patch-errors_Makefile_in 10 Sep 2007 17:49:23 -0000 1.10
+++ patches/patch-errors_Makefile_in 12 Jan 2008 21:56:58 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-errors_Makefile_in,v 1.10 2007/09/10 17:49:23 merdely Exp $
---- errors/Makefile.in.orig Wed Aug 22 20:14:40 2007
-+++ errors/Makefile.in Sun Sep  2 20:17:49 2007
-@@ -237,7 +237,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
+$OpenBSD$
+--- errors/Makefile.in.orig Wed Dec  5 01:10:48 2007
++++ errors/Makefile.in Sat Jan 12 18:31:55 2008
+@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
+ subdirs = @subdirs@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -errordir = $(datadir)/errors
Index: patches/patch-helpers_basic_auth_MSNT_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-helpers_basic_auth_MSNT_Makefile_in
--- patches/patch-helpers_basic_auth_MSNT_Makefile_in 10 Sep 2007 17:49:23 -0000 1.4
+++ patches/patch-helpers_basic_auth_MSNT_Makefile_in 12 Jan 2008 21:56:58 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.4 2007/09/10 17:49:23 merdely Exp $
---- helpers/basic_auth/MSNT/Makefile.in.orig Sun Aug 12 08:40:48 2007
-+++ helpers/basic_auth/MSNT/Makefile.in Sun Sep  2 20:17:49 2007
-@@ -271,7 +271,7 @@ program_transform_name = @program_transform_name@
- psdir = @psdir@
+$OpenBSD$
+--- helpers/basic_auth/MSNT/Makefile.in.orig Sat Jan 12 18:35:42 2008
++++ helpers/basic_auth/MSNT/Makefile.in Sat Jan 12 18:36:14 2008
+@@ -307,7 +307,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
+ subdirs = @subdirs@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @sysconfdir@/squid
  target_alias = @target_alias@
Index: patches/patch-icons_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-icons_Makefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-icons_Makefile_in
--- patches/patch-icons_Makefile_in 10 Sep 2007 17:49:23 -0000 1.10
+++ patches/patch-icons_Makefile_in 12 Jan 2008 21:56:58 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-icons_Makefile_in,v 1.10 2007/09/10 17:49:23 merdely Exp $
---- icons/Makefile.in.orig Sun Aug 12 08:41:05 2007
-+++ icons/Makefile.in Sun Sep  2 20:17:49 2007
-@@ -274,7 +274,7 @@ ICON2 = anthony-bomb.gif \
+$OpenBSD$
+--- icons/Makefile.in.orig Wed Dec  5 01:11:15 2007
++++ icons/Makefile.in Sat Jan 12 18:31:55 2008
+@@ -306,7 +306,7 @@ ICON2 = anthony-bomb.gif \
  anthony-xbm.gif \
  anthony-xpm.gif
 
Index: patches/patch-src_IPInterception_cc
===================================================================
RCS file: patches/patch-src_IPInterception_cc
diff -N patches/patch-src_IPInterception_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_IPInterception_cc 12 Jan 2008 21:56:58 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/IPInterception.cc.orig Sat Jan 12 19:02:07 2008
++++ src/IPInterception.cc Sat Jan 12 19:01:35 2008
+@@ -235,7 +235,7 @@ clientNatLookup(int fd, struct sockaddr_in me, struct
+     static time_t last_reported = 0;
+
+     if (pffd < 0)
+-        pffd = open("/dev/pf", O_RDWR);
++        pffd = open("/dev/pf", O_RDONLY);
+
+     if (pffd < 0)
+     {
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_Makefile_in,v
retrieving revision 1.14
diff -u -r1.14 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 10 Sep 2007 17:49:23 -0000 1.14
+++ patches/patch-src_Makefile_in 12 Jan 2008 21:56:58 -0000
@@ -1,25 +1,25 @@
-$OpenBSD: patch-src_Makefile_in,v 1.14 2007/09/10 17:49:23 merdely Exp $
---- src/Makefile.in.orig Wed Sep  5 17:57:25 2007
-+++ src/Makefile.in Wed Sep  5 21:01:07 2007
-@@ -224,7 +224,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CRYPTLIB = @CRYPTLIB@
+$OpenBSD$
+--- src/Makefile.in.orig Sat Jan 12 18:38:31 2008
++++ src/Makefile.in Sat Jan 12 18:48:00 2008
+@@ -1554,7 +1554,7 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
  CYGPATH_W = @CYGPATH_W@
 -DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 +DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/squid.conf\"
  DEPDIR = @DEPDIR@
  DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
- ECHO_C = @ECHO_C@
-@@ -382,7 +382,7 @@ program_transform_name = @program_transform_name@
- psdir = @psdir@
+ DISK_LIBS = @DISK_LIBS@
+@@ -1737,7 +1737,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
+ subdirs = @subdirs@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @sysconfdir@/squid
  target_alias = @target_alias@
- @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
- @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
-@@ -622,8 +622,8 @@ EXTRA_DIST = \
+ AUTOMAKE_OPTIONS = subdir-objects
+ @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.cc
+@@ -2607,8 +2607,8 @@ DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/li
  DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
  DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
  DEFAULT_PREFIX = $(prefix)
@@ -30,7 +30,7 @@
  DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_LOG_PREFIX = $(localstatedir)/logs
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
-@@ -884,37 +884,37 @@ distclean-compile:
+@@ -4986,37 +4986,37 @@ distclean-libtool:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  @$(NORMAL_INSTALL)
@@ -78,19 +78,19 @@
  done
 
  # This directory's subdirectories are mostly independent; you can cd
-@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES)
- all-am: Makefile $(PROGRAMS) $(DATA)
+@@ -5275,7 +5275,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAM
+ $(HEADERS)
  installdirs: installdirs-recursive
  installdirs-am:
-- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
 + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(DESTDIR)$(prefix)/share/examples/squid"; do \
   test -z "$$dir" || $(mkdir_p) "$$dir"; \
  done
  install: $(BUILT_SOURCES)
-@@ -1236,7 +1236,7 @@ cf.data: cf.data.pre Makefile
- sed "\
+@@ -5454,7 +5454,7 @@ cf.data: cf.data.pre Makefile
  s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
  s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
+ s%@DEFAULT_CACHE_EFFECTIVE_USER@%${CACHE_EFFECTIVE_USER}%g;\
 - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
 + s%@DEFAULT_MIME_TABLE@%$(sysconfdir)/mime.conf%g;\
  s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
Index: patches/patch-src_cf_data_pre
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_cf_data_pre,v
retrieving revision 1.26
diff -u -r1.26 patch-src_cf_data_pre
--- patches/patch-src_cf_data_pre 4 Dec 2007 01:27:13 -0000 1.26
+++ patches/patch-src_cf_data_pre 12 Jan 2008 21:56:58 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_cf_data_pre,v 1.26 2007/12/04 01:27:13 todd Exp $
---- src/cf.data.pre.orig Mon Nov 26 06:03:45 2007
-+++ src/cf.data.pre Sun Dec  2 12:29:01 2007
-@@ -3389,7 +3389,7 @@ DOC_END
+$OpenBSD$
+--- src/cf.data.pre.orig Sat Jan 12 18:50:35 2008
++++ src/cf.data.pre Sat Jan 12 18:54:26 2008
+@@ -3231,7 +3231,7 @@ DOC_END
 
  NAME: cache_effective_user
  TYPE: string
--DEFAULT: nobody
-+DEFAULT: _squid
+-DEFAULT: @DEFAULT_CACHE_EFFECTIVE_USER@
++DEFAULT: _squid
  LOC: Config.effectiveUser
  DOC_START
  If you start Squid as root, it will change its effective/real
-@@ -3403,7 +3403,7 @@ DOC_END
+@@ -3242,7 +3242,7 @@ DOC_END
 
  NAME: cache_effective_group
  TYPE: string
@@ -18,4 +18,4 @@
 +DEFAULT: _squid
  LOC: Config.effectiveGroup
  DOC_START
- If you want Squid to run with a specific GID regardless of
+ Squid sets the GID to the effective user's default group ID
Index: patches/patch-src_client_side_c
===================================================================
RCS file: patches/patch-src_client_side_c
diff -N patches/patch-src_client_side_c
--- patches/patch-src_client_side_c 10 Sep 2007 17:49:23 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_client_side_c,v 1.14 2007/09/10 17:49:23 merdely Exp $
---- src/client_side.c.orig Mon Sep  3 09:13:36 2007
-+++ src/client_side.c Wed Sep  5 21:00:34 2007
-@@ -4441,7 +4441,7 @@ clientNatLookup(ConnStateData * conn)
-     static int pffd = -1;
-     static time_t last_reported = 0;
-     if (pffd < 0) {
-- pffd = open("/dev/pf", O_RDWR);
-+ pffd = open("/dev/pf", O_RDONLY);
- if (pffd >= 0)
-    commSetCloseOnExec(pffd);
-     }
Index: patches/patch-tools_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-tools_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-tools_Makefile_in
--- patches/patch-tools_Makefile_in 20 May 2007 00:52:32 -0000 1.2
+++ patches/patch-tools_Makefile_in 12 Jan 2008 21:56:58 -0000
@@ -1,11 +1,11 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.2 2007/05/20 00:52:32 todd Exp $
---- tools/Makefile.in.orig Sat Nov  4 18:20:05 2006
-+++ tools/Makefile.in Sat May 12 23:44:44 2007
-@@ -65,6 +65,7 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
- am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT)
+$OpenBSD$
+--- tools/Makefile.in.orig Wed Dec  5 01:11:25 2007
++++ tools/Makefile.in Sat Jan 12 18:31:55 2008
+@@ -64,6 +64,7 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+ am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT)
  cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
  cachemgr__CGIEXT__LDADD = $(LDADD)
 +cachemgr__CGIEXT__LDFLAGS = -static
  am__DEPENDENCIES_1 =
  cachemgr__CGIEXT__DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_cossdump_OBJECTS = cossdump.$(OBJEXT)
+ am_squidclient_OBJECTS = squidclient.$(OBJEXT)
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/squid/pkg/MESSAGE,v
retrieving revision 1.16
diff -u -r1.16 MESSAGE
--- pkg/MESSAGE 3 Oct 2006 18:32:44 -0000 1.16
+++ pkg/MESSAGE 12 Jan 2008 21:56:58 -0000
@@ -1,4 +1,4 @@
-NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.6
+NOTES ON OpenBSD POST-INSTALLATION OF SQUID 3.0
 
 The local (OpenBSD) differences are:
 - configuration files are in ${SYSCONFDIR}/squid
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PLIST,v
retrieving revision 1.26
diff -u -r1.26 PLIST
--- pkg/PLIST 10 Sep 2007 17:49:23 -0000 1.26
+++ pkg/PLIST 12 Jan 2008 21:57:04 -0000
@@ -1,11 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.26 2007/09/10 17:49:23 merdely Exp $
 @newgroup _squid:515
 @newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin
+bin/RunAccel
 bin/RunCache
 bin/squidclient
 libexec/cachemgr.cgi
 libexec/digest_pw_auth
-libexec/diskd-daemon
+libexec/diskd
 libexec/ip_user_check
 libexec/ncsa_auth
 libexec/squid_unix_group
@@ -21,67 +22,137 @@
 share/examples/squid/errors/
 @sample share/squid/errors/
 share/examples/squid/errors/Armenian/
+@sample share/squid/errors/Armenian/
 share/examples/squid/errors/Armenian/ERR_ACCESS_DENIED
+@sample share/squid/errors/Armenian/ERR_ACCESS_DENIED
 share/examples/squid/errors/Armenian/ERR_CACHE_ACCESS_DENIED
+@sample share/squid/errors/Armenian/ERR_CACHE_ACCESS_DENIED
 share/examples/squid/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED
+@sample share/squid/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED
 share/examples/squid/errors/Armenian/ERR_CANNOT_FORWARD
+@sample share/squid/errors/Armenian/ERR_CANNOT_FORWARD
 share/examples/squid/errors/Armenian/ERR_CONNECT_FAIL
+@sample share/squid/errors/Armenian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Armenian/ERR_DNS_FAIL
+@sample share/squid/errors/Armenian/ERR_DNS_FAIL
+share/examples/squid/errors/Armenian/ERR_ESI
+@sample share/squid/errors/Armenian/ERR_ESI
 share/examples/squid/errors/Armenian/ERR_FORWARDING_DENIED
+@sample share/squid/errors/Armenian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Armenian/ERR_FTP_DISABLED
+@sample share/squid/errors/Armenian/ERR_FTP_DISABLED
 share/examples/squid/errors/Armenian/ERR_FTP_FAILURE
+@sample share/squid/errors/Armenian/ERR_FTP_FAILURE
 share/examples/squid/errors/Armenian/ERR_FTP_FORBIDDEN
+@sample share/squid/errors/Armenian/ERR_FTP_FORBIDDEN
 share/examples/squid/errors/Armenian/ERR_FTP_NOT_FOUND
+@sample share/squid/errors/Armenian/ERR_FTP_NOT_FOUND
 share/examples/squid/errors/Armenian/ERR_FTP_PUT_CREATED
+@sample share/squid/errors/Armenian/ERR_FTP_PUT_CREATED
 share/examples/squid/errors/Armenian/ERR_FTP_PUT_ERROR
+@sample share/squid/errors/Armenian/ERR_FTP_PUT_ERROR
 share/examples/squid/errors/Armenian/ERR_FTP_PUT_MODIFIED
+@sample share/squid/errors/Armenian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Armenian/ERR_FTP_UNAVAILABLE
+@sample share/squid/errors/Armenian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Armenian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Armenian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Armenian/ERR_INVALID_REQ
+@sample share/squid/errors/Armenian/ERR_INVALID_REQ
 share/examples/squid/errors/Armenian/ERR_INVALID_RESP
+@sample share/squid/errors/Armenian/ERR_INVALID_RESP
 share/examples/squid/errors/Armenian/ERR_INVALID_URL
+@sample share/squid/errors/Armenian/ERR_INVALID_URL
 share/examples/squid/errors/Armenian/ERR_LIFETIME_EXP
+@sample share/squid/errors/Armenian/ERR_LIFETIME_EXP
 share/examples/squid/errors/Armenian/ERR_NO_RELAY
+@sample share/squid/errors/Armenian/ERR_NO_RELAY
 share/examples/squid/errors/Armenian/ERR_ONLY_IF_CACHED_MISS
+@sample share/squid/errors/Armenian/ERR_ONLY_IF_CACHED_MISS
 share/examples/squid/errors/Armenian/ERR_READ_ERROR
+@sample share/squid/errors/Armenian/ERR_READ_ERROR
 share/examples/squid/errors/Armenian/ERR_READ_TIMEOUT
+@sample share/squid/errors/Armenian/ERR_READ_TIMEOUT
 share/examples/squid/errors/Armenian/ERR_SHUTTING_DOWN
+@sample share/squid/errors/Armenian/ERR_SHUTTING_DOWN
 share/examples/squid/errors/Armenian/ERR_SOCKET_FAILURE
+@sample share/squid/errors/Armenian/ERR_SOCKET_FAILURE
 share/examples/squid/errors/Armenian/ERR_TOO_BIG
+@sample share/squid/errors/Armenian/ERR_TOO_BIG
 share/examples/squid/errors/Armenian/ERR_UNSUP_REQ
+@sample share/squid/errors/Armenian/ERR_UNSUP_REQ
 share/examples/squid/errors/Armenian/ERR_URN_RESOLVE
+@sample share/squid/errors/Armenian/ERR_URN_RESOLVE
 share/examples/squid/errors/Armenian/ERR_WRITE_ERROR
+@sample share/squid/errors/Armenian/ERR_WRITE_ERROR
 share/examples/squid/errors/Armenian/ERR_ZERO_SIZE_OBJECT
+@sample share/squid/errors/Armenian/ERR_ZERO_SIZE_OBJECT
 share/examples/squid/errors/Azerbaijani/
+@sample share/squid/errors/Azerbaijani/
 share/examples/squid/errors/Azerbaijani/ERR_ACCESS_DENIED
+@sample share/squid/errors/Azerbaijani/ERR_ACCESS_DENIED
 share/examples/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED
+@sample share/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED
 share/examples/squid/errors/Azerbaijani/ERR_CACHE_MGR_ACCESS_DENIED
+@sample share/squid/errors/Azerbaijani/ERR_CACHE_MGR_ACCESS_DENIED
 share/examples/squid/errors/Azerbaijani/ERR_CANNOT_FORWARD
+@sample share/squid/errors/Azerbaijani/ERR_CANNOT_FORWARD
 share/examples/squid/errors/Azerbaijani/ERR_CONNECT_FAIL
+@sample share/squid/errors/Azerbaijani/ERR_CONNECT_FAIL
 share/examples/squid/errors/Azerbaijani/ERR_DNS_FAIL
+@sample share/squid/errors/Azerbaijani/ERR_DNS_FAIL
+share/examples/squid/errors/Azerbaijani/ERR_ESI
+@sample share/squid/errors/Azerbaijani/ERR_ESI
 share/examples/squid/errors/Azerbaijani/ERR_FORWARDING_DENIED
+@sample share/squid/errors/Azerbaijani/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Azerbaijani/ERR_FTP_DISABLED
+@sample share/squid/errors/Azerbaijani/ERR_FTP_DISABLED
 share/examples/squid/errors/Azerbaijani/ERR_FTP_FAILURE
+@sample share/squid/errors/Azerbaijani/ERR_FTP_FAILURE
 share/examples/squid/errors/Azerbaijani/ERR_FTP_FORBIDDEN
+@sample share/squid/errors/Azerbaijani/ERR_FTP_FORBIDDEN
 share/examples/squid/errors/Azerbaijani/ERR_FTP_NOT_FOUND
+@sample share/squid/errors/Azerbaijani/ERR_FTP_NOT_FOUND
 share/examples/squid/errors/Azerbaijani/ERR_FTP_PUT_CREATED
+@sample share/squid/errors/Azerbaijani/ERR_FTP_PUT_CREATED
 share/examples/squid/errors/Azerbaijani/ERR_FTP_PUT_ERROR
+@sample share/squid/errors/Azerbaijani/ERR_FTP_PUT_ERROR
 share/examples/squid/errors/Azerbaijani/ERR_FTP_PUT_MODIFIED
+@sample share/squid/errors/Azerbaijani/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Azerbaijani/ERR_FTP_UNAVAILABLE
+@sample share/squid/errors/Azerbaijani/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Azerbaijani/ERR_ICAP_FAILURE
+@sample share/squid/errors/Azerbaijani/ERR_ICAP_FAILURE
 share/examples/squid/errors/Azerbaijani/ERR_INVALID_REQ
+@sample share/squid/errors/Azerbaijani/ERR_INVALID_REQ
 share/examples/squid/errors/Azerbaijani/ERR_INVALID_RESP
+@sample share/squid/errors/Azerbaijani/ERR_INVALID_RESP
 share/examples/squid/errors/Azerbaijani/ERR_INVALID_URL
+@sample share/squid/errors/Azerbaijani/ERR_INVALID_URL
 share/examples/squid/errors/Azerbaijani/ERR_LIFETIME_EXP
+@sample share/squid/errors/Azerbaijani/ERR_LIFETIME_EXP
 share/examples/squid/errors/Azerbaijani/ERR_NO_RELAY
+@sample share/squid/errors/Azerbaijani/ERR_NO_RELAY
 share/examples/squid/errors/Azerbaijani/ERR_ONLY_IF_CACHED_MISS
+@sample share/squid/errors/Azerbaijani/ERR_ONLY_IF_CACHED_MISS
 share/examples/squid/errors/Azerbaijani/ERR_READ_ERROR
+@sample share/squid/errors/Azerbaijani/ERR_READ_ERROR
 share/examples/squid/errors/Azerbaijani/ERR_READ_TIMEOUT
+@sample share/squid/errors/Azerbaijani/ERR_READ_TIMEOUT
 share/examples/squid/errors/Azerbaijani/ERR_SHUTTING_DOWN
+@sample share/squid/errors/Azerbaijani/ERR_SHUTTING_DOWN
 share/examples/squid/errors/Azerbaijani/ERR_SOCKET_FAILURE
+@sample share/squid/errors/Azerbaijani/ERR_SOCKET_FAILURE
 share/examples/squid/errors/Azerbaijani/ERR_TOO_BIG
+@sample share/squid/errors/Azerbaijani/ERR_TOO_BIG
 share/examples/squid/errors/Azerbaijani/ERR_UNSUP_REQ
+@sample share/squid/errors/Azerbaijani/ERR_UNSUP_REQ
 share/examples/squid/errors/Azerbaijani/ERR_URN_RESOLVE
+@sample share/squid/errors/Azerbaijani/ERR_URN_RESOLVE
 share/examples/squid/errors/Azerbaijani/ERR_WRITE_ERROR
+@sample share/squid/errors/Azerbaijani/ERR_WRITE_ERROR
 share/examples/squid/errors/Azerbaijani/ERR_ZERO_SIZE_OBJECT
+@sample share/squid/errors/Azerbaijani/ERR_ZERO_SIZE_OBJECT
 share/examples/squid/errors/Bulgarian/
 @sample share/squid/errors/Bulgarian/
 share/examples/squid/errors/Bulgarian/ERR_ACCESS_DENIED
@@ -96,6 +167,8 @@
 @sample share/squid/errors/Bulgarian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Bulgarian/ERR_DNS_FAIL
 @sample share/squid/errors/Bulgarian/ERR_DNS_FAIL
+share/examples/squid/errors/Bulgarian/ERR_ESI
+@sample share/squid/errors/Bulgarian/ERR_ESI
 share/examples/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Bulgarian/ERR_FTP_DISABLED
@@ -114,6 +187,8 @@
 @sample share/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Bulgarian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Bulgarian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Bulgarian/ERR_INVALID_REQ
 @sample share/squid/errors/Bulgarian/ERR_INVALID_REQ
 share/examples/squid/errors/Bulgarian/ERR_INVALID_RESP
@@ -158,6 +233,8 @@
 @sample share/squid/errors/Catalan/ERR_CONNECT_FAIL
 share/examples/squid/errors/Catalan/ERR_DNS_FAIL
 @sample share/squid/errors/Catalan/ERR_DNS_FAIL
+share/examples/squid/errors/Catalan/ERR_ESI
+@sample share/squid/errors/Catalan/ERR_ESI
 share/examples/squid/errors/Catalan/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Catalan/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Catalan/ERR_FTP_DISABLED
@@ -176,6 +253,8 @@
 @sample share/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Catalan/ERR_ICAP_FAILURE
+@sample share/squid/errors/Catalan/ERR_ICAP_FAILURE
 share/examples/squid/errors/Catalan/ERR_INVALID_REQ
 @sample share/squid/errors/Catalan/ERR_INVALID_REQ
 share/examples/squid/errors/Catalan/ERR_INVALID_RESP
@@ -220,6 +299,8 @@
 @sample share/squid/errors/Czech/ERR_CONNECT_FAIL
 share/examples/squid/errors/Czech/ERR_DNS_FAIL
 @sample share/squid/errors/Czech/ERR_DNS_FAIL
+share/examples/squid/errors/Czech/ERR_ESI
+@sample share/squid/errors/Czech/ERR_ESI
 share/examples/squid/errors/Czech/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Czech/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Czech/ERR_FTP_DISABLED
@@ -238,6 +319,8 @@
 @sample share/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Czech/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Czech/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Czech/ERR_ICAP_FAILURE
+@sample share/squid/errors/Czech/ERR_ICAP_FAILURE
 share/examples/squid/errors/Czech/ERR_INVALID_REQ
 @sample share/squid/errors/Czech/ERR_INVALID_REQ
 share/examples/squid/errors/Czech/ERR_INVALID_RESP
@@ -282,6 +365,8 @@
 @sample share/squid/errors/Danish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Danish/ERR_DNS_FAIL
 @sample share/squid/errors/Danish/ERR_DNS_FAIL
+share/examples/squid/errors/Danish/ERR_ESI
+@sample share/squid/errors/Danish/ERR_ESI
 share/examples/squid/errors/Danish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Danish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Danish/ERR_FTP_DISABLED
@@ -300,6 +385,8 @@
 @sample share/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Danish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Danish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Danish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Danish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Danish/ERR_INVALID_REQ
 @sample share/squid/errors/Danish/ERR_INVALID_REQ
 share/examples/squid/errors/Danish/ERR_INVALID_RESP
@@ -344,6 +431,8 @@
 @sample share/squid/errors/Dutch/ERR_CONNECT_FAIL
 share/examples/squid/errors/Dutch/ERR_DNS_FAIL
 @sample share/squid/errors/Dutch/ERR_DNS_FAIL
+share/examples/squid/errors/Dutch/ERR_ESI
+@sample share/squid/errors/Dutch/ERR_ESI
 share/examples/squid/errors/Dutch/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Dutch/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Dutch/ERR_FTP_DISABLED
@@ -362,6 +451,8 @@
 @sample share/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Dutch/ERR_ICAP_FAILURE
+@sample share/squid/errors/Dutch/ERR_ICAP_FAILURE
 share/examples/squid/errors/Dutch/ERR_INVALID_REQ
 @sample share/squid/errors/Dutch/ERR_INVALID_REQ
 share/examples/squid/errors/Dutch/ERR_INVALID_RESP
@@ -406,6 +497,8 @@
 @sample share/squid/errors/English/ERR_CONNECT_FAIL
 share/examples/squid/errors/English/ERR_DNS_FAIL
 @sample share/squid/errors/English/ERR_DNS_FAIL
+share/examples/squid/errors/English/ERR_ESI
+@sample share/squid/errors/English/ERR_ESI
 share/examples/squid/errors/English/ERR_FORWARDING_DENIED
 @sample share/squid/errors/English/ERR_FORWARDING_DENIED
 share/examples/squid/errors/English/ERR_FTP_DISABLED
@@ -424,6 +517,8 @@
 @sample share/squid/errors/English/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/English/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/English/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/English/ERR_ICAP_FAILURE
+@sample share/squid/errors/English/ERR_ICAP_FAILURE
 share/examples/squid/errors/English/ERR_INVALID_REQ
 @sample share/squid/errors/English/ERR_INVALID_REQ
 share/examples/squid/errors/English/ERR_INVALID_RESP
@@ -468,6 +563,8 @@
 @sample share/squid/errors/Estonian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Estonian/ERR_DNS_FAIL
 @sample share/squid/errors/Estonian/ERR_DNS_FAIL
+share/examples/squid/errors/Estonian/ERR_ESI
+@sample share/squid/errors/Estonian/ERR_ESI
 share/examples/squid/errors/Estonian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Estonian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Estonian/ERR_FTP_DISABLED
@@ -486,6 +583,8 @@
 @sample share/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Estonian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Estonian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Estonian/ERR_INVALID_REQ
 @sample share/squid/errors/Estonian/ERR_INVALID_REQ
 share/examples/squid/errors/Estonian/ERR_INVALID_RESP
@@ -530,6 +629,8 @@
 @sample share/squid/errors/Finnish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Finnish/ERR_DNS_FAIL
 @sample share/squid/errors/Finnish/ERR_DNS_FAIL
+share/examples/squid/errors/Finnish/ERR_ESI
+@sample share/squid/errors/Finnish/ERR_ESI
 share/examples/squid/errors/Finnish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Finnish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Finnish/ERR_FTP_DISABLED
@@ -548,6 +649,8 @@
 @sample share/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Finnish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Finnish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Finnish/ERR_INVALID_REQ
 @sample share/squid/errors/Finnish/ERR_INVALID_REQ
 share/examples/squid/errors/Finnish/ERR_INVALID_RESP
@@ -592,6 +695,8 @@
 @sample share/squid/errors/French/ERR_CONNECT_FAIL
 share/examples/squid/errors/French/ERR_DNS_FAIL
 @sample share/squid/errors/French/ERR_DNS_FAIL
+share/examples/squid/errors/French/ERR_ESI
+@sample share/squid/errors/French/ERR_ESI
 share/examples/squid/errors/French/ERR_FORWARDING_DENIED
 @sample share/squid/errors/French/ERR_FORWARDING_DENIED
 share/examples/squid/errors/French/ERR_FTP_DISABLED
@@ -610,6 +715,8 @@
 @sample share/squid/errors/French/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/French/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/French/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/French/ERR_ICAP_FAILURE
+@sample share/squid/errors/French/ERR_ICAP_FAILURE
 share/examples/squid/errors/French/ERR_INVALID_REQ
 @sample share/squid/errors/French/ERR_INVALID_REQ
 share/examples/squid/errors/French/ERR_INVALID_RESP
@@ -654,6 +761,8 @@
 @sample share/squid/errors/German/ERR_CONNECT_FAIL
 share/examples/squid/errors/German/ERR_DNS_FAIL
 @sample share/squid/errors/German/ERR_DNS_FAIL
+share/examples/squid/errors/German/ERR_ESI
+@sample share/squid/errors/German/ERR_ESI
 share/examples/squid/errors/German/ERR_FORWARDING_DENIED
 @sample share/squid/errors/German/ERR_FORWARDING_DENIED
 share/examples/squid/errors/German/ERR_FTP_DISABLED
@@ -672,6 +781,8 @@
 @sample share/squid/errors/German/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/German/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/German/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/German/ERR_ICAP_FAILURE
+@sample share/squid/errors/German/ERR_ICAP_FAILURE
 share/examples/squid/errors/German/ERR_INVALID_REQ
 @sample share/squid/errors/German/ERR_INVALID_REQ
 share/examples/squid/errors/German/ERR_INVALID_RESP
@@ -716,6 +827,8 @@
 @sample share/squid/errors/Greek/ERR_CONNECT_FAIL
 share/examples/squid/errors/Greek/ERR_DNS_FAIL
 @sample share/squid/errors/Greek/ERR_DNS_FAIL
+share/examples/squid/errors/Greek/ERR_ESI
+@sample share/squid/errors/Greek/ERR_ESI
 share/examples/squid/errors/Greek/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Greek/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Greek/ERR_FTP_DISABLED
@@ -734,6 +847,8 @@
 @sample share/squid/errors/Greek/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Greek/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Greek/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Greek/ERR_ICAP_FAILURE
+@sample share/squid/errors/Greek/ERR_ICAP_FAILURE
 share/examples/squid/errors/Greek/ERR_INVALID_REQ
 @sample share/squid/errors/Greek/ERR_INVALID_REQ
 share/examples/squid/errors/Greek/ERR_INVALID_RESP
@@ -778,6 +893,8 @@
 @sample share/squid/errors/Hebrew/ERR_CONNECT_FAIL
 share/examples/squid/errors/Hebrew/ERR_DNS_FAIL
 @sample share/squid/errors/Hebrew/ERR_DNS_FAIL
+share/examples/squid/errors/Hebrew/ERR_ESI
+@sample share/squid/errors/Hebrew/ERR_ESI
 share/examples/squid/errors/Hebrew/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Hebrew/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Hebrew/ERR_FTP_DISABLED
@@ -796,6 +913,8 @@
 @sample share/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Hebrew/ERR_ICAP_FAILURE
+@sample share/squid/errors/Hebrew/ERR_ICAP_FAILURE
 share/examples/squid/errors/Hebrew/ERR_INVALID_REQ
 @sample share/squid/errors/Hebrew/ERR_INVALID_REQ
 share/examples/squid/errors/Hebrew/ERR_INVALID_RESP
@@ -840,6 +959,8 @@
 @sample share/squid/errors/Hungarian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Hungarian/ERR_DNS_FAIL
 @sample share/squid/errors/Hungarian/ERR_DNS_FAIL
+share/examples/squid/errors/Hungarian/ERR_ESI
+@sample share/squid/errors/Hungarian/ERR_ESI
 share/examples/squid/errors/Hungarian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Hungarian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Hungarian/ERR_FTP_DISABLED
@@ -858,6 +979,8 @@
 @sample share/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Hungarian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Hungarian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Hungarian/ERR_INVALID_REQ
 @sample share/squid/errors/Hungarian/ERR_INVALID_REQ
 share/examples/squid/errors/Hungarian/ERR_INVALID_RESP
@@ -902,6 +1025,8 @@
 @sample share/squid/errors/Italian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Italian/ERR_DNS_FAIL
 @sample share/squid/errors/Italian/ERR_DNS_FAIL
+share/examples/squid/errors/Italian/ERR_ESI
+@sample share/squid/errors/Italian/ERR_ESI
 share/examples/squid/errors/Italian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Italian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Italian/ERR_FTP_DISABLED
@@ -920,6 +1045,8 @@
 @sample share/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Italian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Italian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Italian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Italian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Italian/ERR_INVALID_REQ
 @sample share/squid/errors/Italian/ERR_INVALID_REQ
 share/examples/squid/errors/Italian/ERR_INVALID_RESP
@@ -964,6 +1091,8 @@
 @sample share/squid/errors/Japanese/ERR_CONNECT_FAIL
 share/examples/squid/errors/Japanese/ERR_DNS_FAIL
 @sample share/squid/errors/Japanese/ERR_DNS_FAIL
+share/examples/squid/errors/Japanese/ERR_ESI
+@sample share/squid/errors/Japanese/ERR_ESI
 share/examples/squid/errors/Japanese/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Japanese/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Japanese/ERR_FTP_DISABLED
@@ -982,6 +1111,8 @@
 @sample share/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Japanese/ERR_ICAP_FAILURE
+@sample share/squid/errors/Japanese/ERR_ICAP_FAILURE
 share/examples/squid/errors/Japanese/ERR_INVALID_REQ
 @sample share/squid/errors/Japanese/ERR_INVALID_REQ
 share/examples/squid/errors/Japanese/ERR_INVALID_RESP
@@ -1026,6 +1157,8 @@
 @sample share/squid/errors/Korean/ERR_CONNECT_FAIL
 share/examples/squid/errors/Korean/ERR_DNS_FAIL
 @sample share/squid/errors/Korean/ERR_DNS_FAIL
+share/examples/squid/errors/Korean/ERR_ESI
+@sample share/squid/errors/Korean/ERR_ESI
 share/examples/squid/errors/Korean/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Korean/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Korean/ERR_FTP_DISABLED
@@ -1044,6 +1177,8 @@
 @sample share/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Korean/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Korean/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Korean/ERR_ICAP_FAILURE
+@sample share/squid/errors/Korean/ERR_ICAP_FAILURE
 share/examples/squid/errors/Korean/ERR_INVALID_REQ
 @sample share/squid/errors/Korean/ERR_INVALID_REQ
 share/examples/squid/errors/Korean/ERR_INVALID_RESP
@@ -1088,6 +1223,8 @@
 @sample share/squid/errors/Lithuanian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Lithuanian/ERR_DNS_FAIL
 @sample share/squid/errors/Lithuanian/ERR_DNS_FAIL
+share/examples/squid/errors/Lithuanian/ERR_ESI
+@sample share/squid/errors/Lithuanian/ERR_ESI
 share/examples/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Lithuanian/ERR_FTP_DISABLED
@@ -1106,6 +1243,8 @@
 @sample share/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Lithuanian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Lithuanian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Lithuanian/ERR_INVALID_REQ
 @sample share/squid/errors/Lithuanian/ERR_INVALID_REQ
 share/examples/squid/errors/Lithuanian/ERR_INVALID_RESP
@@ -1150,6 +1289,8 @@
 @sample share/squid/errors/Polish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Polish/ERR_DNS_FAIL
 @sample share/squid/errors/Polish/ERR_DNS_FAIL
+share/examples/squid/errors/Polish/ERR_ESI
+@sample share/squid/errors/Polish/ERR_ESI
 share/examples/squid/errors/Polish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Polish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Polish/ERR_FTP_DISABLED
@@ -1168,6 +1309,8 @@
 @sample share/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Polish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Polish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Polish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Polish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Polish/ERR_INVALID_REQ
 @sample share/squid/errors/Polish/ERR_INVALID_REQ
 share/examples/squid/errors/Polish/ERR_INVALID_RESP
@@ -1212,6 +1355,8 @@
 @sample share/squid/errors/Portuguese/ERR_CONNECT_FAIL
 share/examples/squid/errors/Portuguese/ERR_DNS_FAIL
 @sample share/squid/errors/Portuguese/ERR_DNS_FAIL
+share/examples/squid/errors/Portuguese/ERR_ESI
+@sample share/squid/errors/Portuguese/ERR_ESI
 share/examples/squid/errors/Portuguese/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Portuguese/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Portuguese/ERR_FTP_DISABLED
@@ -1230,6 +1375,8 @@
 @sample share/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Portuguese/ERR_ICAP_FAILURE
+@sample share/squid/errors/Portuguese/ERR_ICAP_FAILURE
 share/examples/squid/errors/Portuguese/ERR_INVALID_REQ
 @sample share/squid/errors/Portuguese/ERR_INVALID_REQ
 share/examples/squid/errors/Portuguese/ERR_INVALID_RESP
@@ -1274,6 +1421,8 @@
 @sample share/squid/errors/Romanian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Romanian/ERR_DNS_FAIL
 @sample share/squid/errors/Romanian/ERR_DNS_FAIL
+share/examples/squid/errors/Romanian/ERR_ESI
+@sample share/squid/errors/Romanian/ERR_ESI
 share/examples/squid/errors/Romanian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Romanian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Romanian/ERR_FTP_DISABLED
@@ -1292,6 +1441,8 @@
 @sample share/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Romanian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Romanian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Romanian/ERR_INVALID_REQ
 @sample share/squid/errors/Romanian/ERR_INVALID_REQ
 share/examples/squid/errors/Romanian/ERR_INVALID_RESP
@@ -1336,6 +1487,8 @@
 @sample share/squid/errors/Russian-1251/ERR_CONNECT_FAIL
 share/examples/squid/errors/Russian-1251/ERR_DNS_FAIL
 @sample share/squid/errors/Russian-1251/ERR_DNS_FAIL
+share/examples/squid/errors/Russian-1251/ERR_ESI
+@sample share/squid/errors/Russian-1251/ERR_ESI
 share/examples/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Russian-1251/ERR_FTP_DISABLED
@@ -1354,6 +1507,8 @@
 @sample share/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Russian-1251/ERR_ICAP_FAILURE
+@sample share/squid/errors/Russian-1251/ERR_ICAP_FAILURE
 share/examples/squid/errors/Russian-1251/ERR_INVALID_REQ
 @sample share/squid/errors/Russian-1251/ERR_INVALID_REQ
 share/examples/squid/errors/Russian-1251/ERR_INVALID_RESP
@@ -1398,6 +1553,8 @@
 @sample share/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
 share/examples/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
 @sample share/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
+share/examples/squid/errors/Russian-koi8-r/ERR_ESI
+@sample share/squid/errors/Russian-koi8-r/ERR_ESI
 share/examples/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
@@ -1416,6 +1573,8 @@
 @sample share/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Russian-koi8-r/ERR_ICAP_FAILURE
+@sample share/squid/errors/Russian-koi8-r/ERR_ICAP_FAILURE
 share/examples/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
 @sample share/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
 share/examples/squid/errors/Russian-koi8-r/ERR_INVALID_RESP
@@ -1460,6 +1619,8 @@
 @sample share/squid/errors/Serbian/ERR_CONNECT_FAIL
 share/examples/squid/errors/Serbian/ERR_DNS_FAIL
 @sample share/squid/errors/Serbian/ERR_DNS_FAIL
+share/examples/squid/errors/Serbian/ERR_ESI
+@sample share/squid/errors/Serbian/ERR_ESI
 share/examples/squid/errors/Serbian/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Serbian/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Serbian/ERR_FTP_DISABLED
@@ -1478,6 +1639,8 @@
 @sample share/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Serbian/ERR_ICAP_FAILURE
+@sample share/squid/errors/Serbian/ERR_ICAP_FAILURE
 share/examples/squid/errors/Serbian/ERR_INVALID_REQ
 @sample share/squid/errors/Serbian/ERR_INVALID_REQ
 share/examples/squid/errors/Serbian/ERR_INVALID_RESP
@@ -1522,6 +1685,8 @@
 @sample share/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
 share/examples/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
 @sample share/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
+share/examples/squid/errors/Simplify_Chinese/ERR_ESI
+@sample share/squid/errors/Simplify_Chinese/ERR_ESI
 share/examples/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
@@ -1540,6 +1705,8 @@
 @sample share/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Simplify_Chinese/ERR_ICAP_FAILURE
+@sample share/squid/errors/Simplify_Chinese/ERR_ICAP_FAILURE
 share/examples/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
 @sample share/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
 share/examples/squid/errors/Simplify_Chinese/ERR_INVALID_RESP
@@ -1584,6 +1751,8 @@
 @sample share/squid/errors/Slovak/ERR_CONNECT_FAIL
 share/examples/squid/errors/Slovak/ERR_DNS_FAIL
 @sample share/squid/errors/Slovak/ERR_DNS_FAIL
+share/examples/squid/errors/Slovak/ERR_ESI
+@sample share/squid/errors/Slovak/ERR_ESI
 share/examples/squid/errors/Slovak/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Slovak/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Slovak/ERR_FTP_DISABLED
@@ -1602,6 +1771,8 @@
 @sample share/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Slovak/ERR_ICAP_FAILURE
+@sample share/squid/errors/Slovak/ERR_ICAP_FAILURE
 share/examples/squid/errors/Slovak/ERR_INVALID_REQ
 @sample share/squid/errors/Slovak/ERR_INVALID_REQ
 share/examples/squid/errors/Slovak/ERR_INVALID_RESP
@@ -1646,6 +1817,8 @@
 @sample share/squid/errors/Spanish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Spanish/ERR_DNS_FAIL
 @sample share/squid/errors/Spanish/ERR_DNS_FAIL
+share/examples/squid/errors/Spanish/ERR_ESI
+@sample share/squid/errors/Spanish/ERR_ESI
 share/examples/squid/errors/Spanish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Spanish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Spanish/ERR_FTP_DISABLED
@@ -1664,6 +1837,8 @@
 @sample share/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Spanish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Spanish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Spanish/ERR_INVALID_REQ
 @sample share/squid/errors/Spanish/ERR_INVALID_REQ
 share/examples/squid/errors/Spanish/ERR_INVALID_RESP
@@ -1708,6 +1883,8 @@
 @sample share/squid/errors/Swedish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Swedish/ERR_DNS_FAIL
 @sample share/squid/errors/Swedish/ERR_DNS_FAIL
+share/examples/squid/errors/Swedish/ERR_ESI
+@sample share/squid/errors/Swedish/ERR_ESI
 share/examples/squid/errors/Swedish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Swedish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Swedish/ERR_FTP_DISABLED
@@ -1726,6 +1903,8 @@
 @sample share/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Swedish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Swedish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Swedish/ERR_INVALID_REQ
 @sample share/squid/errors/Swedish/ERR_INVALID_REQ
 share/examples/squid/errors/Swedish/ERR_INVALID_RESP
@@ -1770,6 +1949,8 @@
 @sample share/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
 share/examples/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
 @sample share/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
+share/examples/squid/errors/Traditional_Chinese/ERR_ESI
+@sample share/squid/errors/Traditional_Chinese/ERR_ESI
 share/examples/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
@@ -1788,6 +1969,8 @@
 @sample share/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Traditional_Chinese/ERR_ICAP_FAILURE
+@sample share/squid/errors/Traditional_Chinese/ERR_ICAP_FAILURE
 share/examples/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
 @sample share/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
 share/examples/squid/errors/Traditional_Chinese/ERR_INVALID_RESP
@@ -1832,6 +2015,8 @@
 @sample share/squid/errors/Turkish/ERR_CONNECT_FAIL
 share/examples/squid/errors/Turkish/ERR_DNS_FAIL
 @sample share/squid/errors/Turkish/ERR_DNS_FAIL
+share/examples/squid/errors/Turkish/ERR_ESI
+@sample share/squid/errors/Turkish/ERR_ESI
 share/examples/squid/errors/Turkish/ERR_FORWARDING_DENIED
 @sample share/squid/errors/Turkish/ERR_FORWARDING_DENIED
 share/examples/squid/errors/Turkish/ERR_FTP_DISABLED
@@ -1850,6 +2035,8 @@
 @sample share/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
 share/examples/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
 @sample share/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Turkish/ERR_ICAP_FAILURE
+@sample share/squid/errors/Turkish/ERR_ICAP_FAILURE
 share/examples/squid/errors/Turkish/ERR_INVALID_REQ
 @sample share/squid/errors/Turkish/ERR_INVALID_REQ
 share/examples/squid/errors/Turkish/ERR_INVALID_RESP