Sun Oct 17 02:15:33 CEST 1999
Modified Files in squid/src
	access_log.c helper.c protos.h 

Include extended information in helper pages (dnsserver and redirectors),
showing the request sent to each helper while being buzy.

-----------------------------------------------------------------

Index: squid/src/access_log.c
diff -u squid/src/access_log.c:1.1.1.26.2.1 squid/src/access_log.c:1.1.1.26.2.2
--- squid/src/access_log.c:1.1.1.26.2.1	Tue Jul 13 00:35:37 1999
+++ squid/src/access_log.c	Sun Oct 17 02:15:32 1999
@@ -38,7 +38,6 @@
 #include "squid.h"
 
 static void accessLogOpen(const char *fname);
-static char *log_quote(const char *header);
 static void accessLogSquid(AccessLogEntry * al, MemBuf * mb);
 static void accessLogCommon(AccessLogEntry * al, MemBuf * mb);
 
@@ -114,7 +113,7 @@
 
 /* log_quote -- URL-style encoding on MIME headers. */
 
-static char *
+char *
 log_quote(const char *header)
 {
     int c;
Index: squid/src/helper.c
diff -u squid/src/helper.c:1.1.1.6.2.6 squid/src/helper.c:1.1.1.6.2.7
--- squid/src/helper.c:1.1.1.6.2.6	Sun Oct 17 02:06:41 1999
+++ squid/src/helper.c	Sun Oct 17 02:15:32 1999
@@ -130,17 +130,18 @@
     storeAppendPrintf(sentry, "avg service time: %d msec\n",
 	hlp->stats.avg_svc_time);
     storeAppendPrintf(sentry, "\n");
-    storeAppendPrintf(sentry, "%7s\t%7s\t%11s\t%s\t%7s\t%7s\n",
+    storeAppendPrintf(sentry, "%7s\t%7s\t%11s\t%s\t%7s\t%7s\t%7s\n",
 	"#",
 	"FD",
 	"# Requests",
 	"Flags",
 	"Time",
-	"Offset");
+	"Offset",
+	"Request");
     for (link = hlp->servers.head; link; link = link->next) {
 	srv = link->data;
 	tt = 0.001 * tvSubMsec(srv->dispatch_time, current_time);
-	storeAppendPrintf(sentry, "%7d\t%7d\t%11d\t%c%c%c%c\t%7.3f\t%7d\n",
+	storeAppendPrintf(sentry, "%7d\t%7d\t%11d\t%c%c%c%c\t%7.3f\t%7d\t%s\n",
 	    srv->index + 1,
 	    srv->rfd,
 	    srv->stats.uses,
@@ -149,7 +150,8 @@
 	    srv->flags.closing ? 'C' : ' ',
 	    srv->flags.shutdown ? 'S' : ' ',
 	    tt < 0.0 ? 0.0 : tt,
-	    (int) srv->offset);
+	    (int) srv->offset,
+	    srv->request ? log_quote(srv->request->buf) : "(none)");
     }
     storeAppendPrintf(sentry, "\nFlags key:\n\n");
     storeAppendPrintf(sentry, "   A = ALIVE\n");
Index: squid/src/protos.h
diff -u squid/src/protos.h:1.1.1.42.2.6 squid/src/protos.h:1.1.1.42.2.7
--- squid/src/protos.h:1.1.1.42.2.6	Tue Jul 27 20:47:48 1999
+++ squid/src/protos.h	Sun Oct 17 02:15:32 1999
@@ -41,6 +41,7 @@
 extern void fvdbCountVia(const char *key);
 extern void fvdbCountForw(const char *key);
 #endif
+char *log_quote(const char *header);
 
 extern aclCheck_t *aclChecklistCreate(const struct _acl_access *,
     request_t *,