From: wessels <>
Date: Wed, 27 May 1998 05:56:19 +0000 (+0000)
Subject: Generate error for 'squid-internal-*' MISSes
X-Git-Tag: SQUID_3_0_PRE1~3248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=865094d73abebf288fe395a73060a7a2d51d360a;p=thirdparty%2Fsquid.git

Generate error for 'squid-internal-*' MISSes
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index a163306767..e6356c9ad8 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.132 1998/05/21 00:01:29 wessels Exp $
+ * $Id: errorpage.cc,v 1.133 1998/05/26 23:56:20 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -440,7 +440,24 @@ errorConvert(char token, ErrorState * err)
 	p = r ? ProtocolStr[r->protocol] : "[unkown protocol]";
 	break;
     case 'R':
-	p = err->request_hdrs ? err->request_hdrs : "[no request]";
+	if (NULL != r) {
+	    MemBuf mb;
+	    Packer p;
+	    memBufDefInit(&mb);
+	    memBufPrintf(&mb, "%s %s HTTP/%3.1f\n",
+		RequestMethodStr[r->method],
+		strLen(r->urlpath) ? strBuf(r->urlpath) : "/",
+		(double) r->http_ver);
+	    packerToMemInit(&p, &mb);
+	    httpHeaderPackInto(&r->header, &p);
+	    packerClean(&p);
+	    xstrncpy(buf, mb.buf, CVT_BUF_SZ);
+	    memBufClean(&mb);
+	} else if (err->request_hdrs) {
+	    p = err->request_hdrs;
+	} else {
+	    p = "[no request]";
+	}
 	break;
     case 's':
 	p = full_appname_string;
diff --git a/src/internal.cc b/src/internal.cc
index ebd6ef971e..032fefcaca 100644
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -4,13 +4,18 @@
 void
 internalStart(request_t * request, StoreEntry * entry)
 {
+    ErrorState *err;
     const char *upath = strBuf(request->urlpath);
     debug(0, 1) ("internalStart: %s requesting '%s'\n",
 	inet_ntoa(request->client_addr), upath);
     if (0 == strcmp(upath, "/squid-internal-dynamic/netdb"))
 	netdbBinaryExchange(entry);
-    else
+    else {
 	debug(0, 0) ("internalStart: unknown request '%s'\n", upath);
+	err = errorCon(ERR_INVALID_REQ, HTTP_NOT_FOUND);
+	err->request = requestLink(request);
+	errorAppendEntry(entry, err);
+    }
 }
 
 int