2.1 branch merge

[thirdparty/squid.git] / src / forward.cc

diff --git a/src/forward.cc b/src/forward.cc
index cbaef52c3ca39e64025f1b51ad737e757fff3a3c..a46acc70bcc4d94a4390ba571688a33de5127bcf 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.30 1998/09/23 20:13:48 wessels Exp $
+ * $Id: forward.cc,v 1.31 1998/11/12 06:28:05 wessels Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -255,7 +255,6 @@ fwdDispatch(FwdState * fwdState)
     peer *p;
     request_t *request = fwdState->request;
     StoreEntry *entry = fwdState->entry;
-    ErrorState *err;
     debug(17, 5) ("fwdDispatch: FD %d: Fetching '%s %s'\n",
        fwdState->client_fd,
        RequestMethodStr[request->method],
@@ -299,9 +298,8 @@ fwdDispatch(FwdState * fwdState)
        default:
            debug(17, 1) ("fwdDispatch: Cannot retrieve '%s'\n",
                storeUrl(entry));
-           err = errorCon(ERR_UNSUP_REQ, HTTP_BAD_REQUEST);
-           err->request = requestLink(request);
-           errorAppendEntry(entry, err);
+           fwdFail(fwdState, ERR_UNSUP_REQ, HTTP_BAD_REQUEST, -1);
+           comm_close(fwdState->server_fd);
            break;
        }
     }