]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7874336)
The ERR_CANNOT_FORWARD error was overloaded. The text of the message
authorwessels <>
Thu, 1 Jan 1998 05:11:56 +0000 (05:11 +0000)
committerwessels <>
Thu, 1 Jan 1998 05:11:56 +0000 (05:11 +0000)
implies that a 'miss_access' rule is the cause.  This error has
been renamed to ERR_FORWARDING_DENIED.  The meaning of ERR_CANNOT_FORWARD
has been changed to mean that we could not find a next-hop source
for this request, presumably because 'never_direct' is in use and all
parent caches are down.

errors/English/ERR_FORWARDING_DENIED [new file with mode: 0644] patch | blob
src/client_side.cc patch | blob | blame | history
src/enums.h patch | blob | blame | history

diff --git a/errors/English/ERR_FORWARDING_DENIED b/errors/English/ERR_FORWARDING_DENIED
new file mode 100644 (file)
index 0000000..de107e0
--- /dev/null
+++ b/errors/English/ERR_FORWARDING_DENIED
@@ -0,0 +1,22 @@
+<HTML><HEAD>
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+</HEAD><BODY>
+<H1>ERROR</H1>
+<H2>The requested URL could not be retrieved</H2>
+<HR>
+<P>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Forwarding Denied.
+</STRONG>
+</UL>
+
+<P>
+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.
diff --git a/src/client_side.cc b/src/client_side.cc
index a600859b8aeb7aff5a2fcd3c317654c3fe71114f..860f41838133c28507e9b487aef9ca786ec62ebe 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.179 1997/12/30 02:47:39 wessels Exp $
+ * $Id: client_side.cc,v 1.180 1997/12/31 22:11:56 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1318,7 +1318,7 @@ clientProcessMiss(clientHttpRequest * http)
     answer = aclCheckFast(Config.accessList.miss, &ch);
     if (answer == 0) {
        http->al.http.code = HTTP_FORBIDDEN;
-       err = errorCon(ERR_CANNOT_FORWARD, HTTP_FORBIDDEN);
+       err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
        err->request = requestLink(r);
        err->src_addr = http->conn->peer.sin_addr;
        http->entry = clientCreateStoreEntry(http, r->method, 0);
diff --git a/src/enums.h b/src/enums.h
index 458a982da62dfbf843e3f9dc4cb398248a52badd..78f0dee6bf01f83109659525acb9d607ed9120f8 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -37,6 +37,7 @@ typedef enum {
     ERR_SOCKET_FAILURE,
     ERR_DNS_FAIL,
     ERR_CANNOT_FORWARD,
+    ERR_FORWARDING_DENIED,
     ERR_NO_RELAY,
     ERR_ZERO_SIZE_OBJECT,
     ERR_FTP_DISABLED,
Mirror of https://github.com/squid-cache/squid.git