While trying to retrieve the URL: -%u +%U
The following error was encountered: -
+Unable to determine IP address from host name for +%H +
-The system returned: -
@XSTRERROR@+The dnsserver returned: +
+%z +
This means that:
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 51e85bce6e..5b155166e8 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
/*
- * $Id: cache_cf.cc,v 1.220 1997/08/25 03:52:16 wessels Exp $
+ * $Id: cache_cf.cc,v 1.221 1997/08/25 05:29:55 wessels Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
@@ -172,6 +172,8 @@ parseConfigFile(const char *file_name)
}
/* Sanity checks */
+ if (Config.cacheSwap.swapDirs == NULL)
+ fatal("No cache_dir's specified in config file");
if (Config.Swap.maxSize < (Config.Mem.maxSize >> 10)) {
printf("WARNING: cache_swap (%d kbytes) is less than cache_mem (%d bytes).\n", Config.Swap.maxSize, Config.Mem.maxSize);
printf(" This will cause serious problems with your cache!!!\n");
@@ -1127,3 +1129,4 @@ configFreeMemory(void)
{
free_all();
}
+
diff --git a/src/cachemgr.cc b/src/cachemgr.cc
index be0ac59237..9e319080db 100644
--- a/src/cachemgr.cc
+++ b/src/cachemgr.cc
@@ -1,7 +1,7 @@
/*
- * $Id: cachemgr.cc,v 1.56 1997/07/16 20:31:58 wessels Exp $
+ * $Id: cachemgr.cc,v 1.57 1997/08/25 05:29:55 wessels Exp $
*
* DEBUG: section 0 CGI Cache Manager
* AUTHOR: Harvest Derived
@@ -249,17 +249,17 @@ static const char *const op_cmds[] =
"client_list",
"log",
"parameter",
- "stats/ipcache",
- "stats/fqdncache",
- "stats/dns",
- "stats/redirector",
- "stats/objects",
- "stats/vm_objects",
- "stats/utilization",
- "stats/io",
- "stats/reply_headers",
- "stats/filedescriptors",
- "stats/netdb",
+ "ipcache",
+ "fqdncache",
+ "dns",
+ "redirector",
+ "objects",
+ "vm_objects",
+ "utilization",
+ "io",
+ "reply_headers",
+ "filedescriptors",
+ "netdb",
"shutdown",
"refresh",
#ifdef REMOVE_OBJECT
diff --git a/src/cf.data.pre b/src/cf.data.pre
index d0b8b5bdf0..0ea1f23965 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -40,7 +40,7 @@ DOC_START
understand the difference between an ICP _query_ and an ICP
_reply_. This option is to be set only if you want to RECEIVE
multicast queries. Do NOT set this option to SEND multicast
- ICP (use cache_host for that). ICP replies are always sent via
+ ICP (use cache_peer for that). ICP replies are always sent via
unicast, so this option does not affect whether or not you will
receive replies from multicast group members.
@@ -122,9 +122,9 @@ DOC_START
# proxy icp
# hostname type port port options
# -------------------- -------- ----- ----- -----------
- cache_host bigserver.usc.edu parent 3128 3130 [proxy-only]
- cache_host littleguy1.usc.edu sibling 3128 3130 [proxy-only]
- cache_host littleguy1.usc.edu sibling 3128 3130 [proxy-only]
+ cache_peer bigserver.usc.edu parent 3128 3130 [proxy-only]
+ cache_peer littleguy1.usc.edu sibling 3128 3130 [proxy-only]
+ cache_peer littleguy1.usc.edu sibling 3128 3130 [proxy-only]
type: either 'parent', 'sibling', or 'multicast'.
@@ -183,7 +183,7 @@ DOC_START
NOTE: non-ICP neighbors must be specified as 'parent'.
-cache_host hostname type 3128 3130
+cache_peer hostname type 3128 3130
DOC_END
@@ -229,13 +229,13 @@ DOC_START
Modifying the neighbor type for specific domains is now
possible. You can treat some domains differently than the the
- default neighbor type specified on the 'cache_host' line.
+ default neighbor type specified on the 'cache_peer' line.
Normally it should only be necessary to list domains which
should be treated differently because the default neighbor type
applies for hostnames which do not match domains listed here.
EXAMPLE:
- cache_host parent cache.foo.org 3128 3130
+ cache_peer parent cache.foo.org 3128 3130
neighbor_type_domain cache.foo.org sibling .com .net
neighbor_type_domain cache.foo.org sibling .au .de
DOC_END
@@ -499,7 +499,7 @@ DOC_START
You can specify multiple cache_dir lines to spread the
cache among different disk partitions.
-cache_dir /usr/local/squid/cache 1000 256 16
+cache_dir /usr/local/squid/cache 1000 16 256
DOC_END
@@ -787,7 +787,7 @@ DOC_END
NAME: pinger_program
-TYPE: pathname_stat
+TYPE: string
DEFAULT: @DEFAULT_PINGER@
LOC: Config.Program.pinger
DOC_START
@@ -1274,13 +1274,13 @@ DOC_END
NAME: cache_effective_user
TYPE: string
-DEFAULT: none
+DEFAULT: nobody
LOC: Config.effectiveUser
DOC_NONE
NAME: cache_effective_group
TYPE: string
-DEFAULT: none
+DEFAULT: nogroup
LOC: Config.effectiveGroup
DOC_START
If the cache is run as root, it will change its effective/real
diff --git a/src/mk-globals-c.pl b/src/mk-globals-c.pl
index 5cc2a1a13e..70f626bdbe 100755
--- a/src/mk-globals-c.pl
+++ b/src/mk-globals-c.pl
@@ -10,7 +10,7 @@ while (<>) {
die unless (/^extern\s+([^;]+);(.*)$/);
$var = $1;
$comments = $2;
- if ($comments =~ m+/\*\s*(.*)\s*\*/+) {
+ if ($comments =~ m+/\*\s*(\S*)\s*\*/+) {
$init = $1;
}
print $var;
diff --git a/src/pinger.cc b/src/pinger.cc
index 53b08584fc..58bdd33a1a 100644
--- a/src/pinger.cc
+++ b/src/pinger.cc
@@ -1,6 +1,6 @@
/*
- * $Id: pinger.cc,v 1.25 1997/07/14 19:24:39 wessels Exp $
+ * $Id: pinger.cc,v 1.26 1997/08/25 05:29:57 wessels Exp $
*
* DEBUG: section 42 ICMP Pinger program
* AUTHOR: Duane Wessels
@@ -31,11 +31,6 @@
#include "squid.h"
-/* Junk so we can link with debug.o */
-struct timeval current_time;
-time_t squid_curtime;
-SquidConfig Config;
-
#if USE_ICMP
#include