From: wessels <> Date: Thu, 1 Jan 1998 05:11:56 +0000 (+0000) Subject: The ERR_CANNOT_FORWARD error was overloaded. The text of the message X-Git-Tag: SQUID_3_0_PRE1~4315 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdb3c273ceef5ea290ba545751d25c564ffcaefd;p=thirdparty%2Fsquid.git The ERR_CANNOT_FORWARD error was overloaded. The text of the message 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. --- diff --git a/errors/English/ERR_FORWARDING_DENIED b/errors/English/ERR_FORWARDING_DENIED new file mode 100644 index 0000000000..de107e06e5 --- /dev/null +++ b/errors/English/ERR_FORWARDING_DENIED @@ -0,0 +1,22 @@ + +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 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 a600859b8a..860f418381 100644 --- 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 458a982da6..78f0dee6bf 100644 --- 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,