--------------------- PatchSet 4773 Date: 2002/08/25 08:59:00 Author: rbcollins Branch: esi Tag: (none) Log: ESI specific error page, a surrogate ID specifiedr, and define ESI when compiling ESI support. Members: configure.in:1.61.2.3->1.61.2.4 errors/Bulgarian/ERR_ESI:1.1->1.1.2.1 errors/Catalan/ERR_ESI:1.1->1.1.2.1 errors/Czech/ERR_ESI:1.1->1.1.2.1 errors/Danish/ERR_ESI:1.1->1.1.2.1 errors/Dutch/ERR_ESI:1.1->1.1.2.1 errors/English/ERR_ESI:1.1->1.1.2.1 errors/Estonian/ERR_ESI:1.1->1.1.2.1 errors/Finnish/ERR_ESI:1.1->1.1.2.1 errors/French/ERR_ESI:1.1->1.1.2.1 errors/German/ERR_ESI:1.1->1.1.2.1 errors/Hebrew/ERR_ESI:1.1->1.1.2.1 errors/Hungarian/ERR_ESI:1.1->1.1.2.1 errors/Italian/ERR_ESI:1.1->1.1.2.1 errors/Japanese/ERR_ESI:1.1->1.1.2.1 errors/Korean/ERR_ESI:1.1->1.1.2.1 errors/Polish/ERR_ESI:1.1->1.1.2.1 errors/Portuguese/ERR_ESI:1.1->1.1.2.1 errors/Romanian/ERR_ESI:1.1->1.1.2.1 errors/Russian-1251/ERR_ESI:1.1->1.1.2.1 errors/Russian-koi8-r/ERR_ESI:1.1->1.1.2.1 errors/Serbian/ERR_ESI:1.1->1.1.2.1 errors/Simplify_Chinese/ERR_ESI:1.1->1.1.2.1 errors/Slovak/ERR_ESI:1.1->1.1.2.1 errors/Spanish/ERR_ESI:1.1->1.1.2.1 errors/Swedish/ERR_ESI:1.1->1.1.2.1 errors/Traditional_Chinese/ERR_ESI:1.1->1.1.2.1 errors/Turkish/ERR_ESI:1.1->1.1.2.1 src/ESI.c:1.1.2.23->1.1.2.24 src/cf.data.pre:1.72.2.1->1.72.2.2 src/client_side_reply.c:1.1.2.17->1.1.2.18 src/enums.h:1.37.2.3->1.37.2.4 src/errorpage.c:1.21->1.21.2.1 src/http.c:1.21.2.1->1.21.2.2 src/protos.h:1.59.2.9->1.59.2.10 src/structs.h:1.61.2.7->1.61.2.8 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.61.2.3 retrieving revision 1.61.2.4 diff -u -r1.61.2.3 -r1.61.2.4 --- squid/configure.in 18 Aug 2002 11:09:22 -0000 1.61.2.3 +++ squid/configure.in 25 Aug 2002 08:59:00 -0000 1.61.2.4 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.61.2.3 2002/08/18 11:09:22 rbcollins Exp $ +dnl $Id: configure.in,v 1.61.2.4 2002/08/25 08:59:00 rbcollins Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.61.2.3 $)dnl +AC_REVISION($Revision: 1.61.2.4 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -466,6 +466,7 @@ ac_cv_use_esi=$enableval, ac_cv_use_esi=no) AC_CACHE_CHECK(whether to enable ESI,ac_cv_use_esi, ac_cv_use_esi=no) if test "$ac_cv_use_esi" = "yes" ; then + AC_DEFINE(ESI,1,[Compile the ESI processor and Surrogate header support]) AM_CONDITIONAL(USE_ESI, true) XTRA_LIBS="$XTRA_LIBS -lexpat" fi --- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Bulgarian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + +
++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Catalan/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Czech/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Danish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Dutch/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/English/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,28 @@ + + ++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. --- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Estonian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + +
++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Finnish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/French/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/German/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Hebrew/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Hungarian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Italian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Japanese/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Korean/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Polish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Portuguese/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Romanian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Russian-1251/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Russian-koi8-r/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Serbian/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Simplify_Chinese/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Slovak/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Spanish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Swedish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Traditional_Chinese/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
--- /dev/null Wed Feb 14 01:02:27 2007 +++ squid/errors/Turkish/ERR_ESI Wed Feb 14 01:02:39 2007 @@ -0,0 +1,29 @@ + + ++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.
Index: squid/src/ESI.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/ESI.c,v retrieving revision 1.1.2.23 retrieving revision 1.1.2.24 diff -u -r1.1.2.23 -r1.1.2.24 --- squid/src/ESI.c 25 Aug 2002 02:46:07 -0000 1.1.2.23 +++ squid/src/ESI.c 25 Aug 2002 08:59:04 -0000 1.1.2.24 @@ -1,6 +1,6 @@ /* - * $Id: ESI.c,v 1.1.2.23 2002/08/25 02:46:07 rbcollins Exp $ + * $Id: ESI.c,v 1.1.2.24 2002/08/25 08:59:04 rbcollins Exp $ * * DEBUG: section 86 ESI processing * AUTHOR: Robert Collins @@ -338,6 +338,7 @@ } flags; err_type errorpage; /* if we error what page to use */ http_status errorstatus; /* if we error, what code to return */ + char *errormessage; /* error to pass to error page */ HttpReply *rep; /* buffered until we pass data downstream */ esiSegment *buffered; /* unprocessed data - for whatever reason */ esiSegment *incoming; @@ -782,6 +783,8 @@ { esiContext *context = data; esiContextFreeResources (context); + /* Not freed by freeresources because esiFail needs it */ + safe_free (context->errormessage); return; } @@ -1042,14 +1045,17 @@ assert (XML_Parse (p, "