From: wessels <>
Date: Fri, 23 Apr 1999 08:57:11 +0000 (+0000)
Subject: branch 2.2 merge
X-Git-Tag: SQUID_3_0_PRE1~2253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b8e748172a520691893b7b14378dd50943995c0;p=thirdparty%2Fsquid.git

branch 2.2 merge
---

diff --git a/ChangeLog b/ChangeLog
index 3cd3a40510..ea627a705c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes to Squid-2.2 ():
+Changes to Squid-2.2 (April 19, 1999):
 
 	- Removed all SNMP specific ACL code
 	  SNMP now uses generic squid ACL's
@@ -145,6 +145,37 @@ Changes to Squid-2.2 ():
 	- Fixed a "F->flags.open" assertion for aborted FTP PUT's.
 	- Fixed a (double) cast problem that caused statAvgTick()
 	  events to be added as fast as possible.
+	- Changed httpPacked304Reply() to not include the Content-Length
+	  header for 304 replies that Squid generates.  We used to
+	  include the length of the cached object, and this broke
+	  persistent connections.
+
+	2.2.STABLE2:
+
+	- Fixed configure bug for statvfs() checks.  Configure reports
+	  "test: =: unary operator expected" or similar because an
+	  unquoted variable is not defined.
+	- Fixed aclDestroyAcls() assertion because some ACL types
+	  are not listed in the switch statement.  Occurs for
+	  srcdom_regex and dstdom_regex ACL types during reconfigure.
+	- Typo "applicatoin" in src/mime.conf
+	- The unlinkd daemon never saw the USE_TRUNCATE_NOT_UNLINK
+	  #define because it didn't include squid.h.
+	- Fixed commRetryFD() when bind() fails.   commRetryFD was
+	  closing the filedescriptor, but it is the upper layer's
+	  job to close it.
+	- Changed configure's "maximum number of filedescriptors"
+	  detection to only use getrlimit() for Linux.  On AIX,
+	  getrlimit returns RLIM_INFINITY.
+	- Fixed snmpInit() nesting bug.
+	- Fixed a bug with peerGetSomeParent().  It was adding
+	  a parent to the FwdServers list, regardless of the
+	  ps->direct value.  This could cause every request to
+	  go to a parent even when always_direct is used.
+	- Changed fwdServerClosed() to rotate the "forward servers"
+	  list when a connection establishment fails.  Otherwise
+	  it always kept trying to connect to the first server
+	  int the list.
 
 Changes to Squid-2.1 (November 16, 1998):
 
diff --git a/configure b/configure
index bc22d79839..787cb7901a 100755
--- a/configure
+++ b/configure
@@ -591,7 +591,7 @@ fi
 
 
 
-# From configure.in Revision: 1.169 
+# From configure.in Revision: 1.170 
 ac_aux_dir=
 for ac_dir in cfgaux $srcdir/cfgaux; do
   if test -f $ac_dir/install-sh; then
@@ -4774,12 +4774,12 @@ else
 fi
 rm -f conftest*
 echo "$ac_t""$ac_cv_func_statvfs" 1>&6
-fi
-if test $ac_cv_func_statvfs = "yes" ; then
+if test "$ac_cv_func_statvfs" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define HAVE_STATVFS 1
 EOF
 
+fi
 fi
 
 echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index c56cb56a10..2119561987 100644
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.170 1999/04/21 03:51:55 wessels Exp $
+dnl  $Id: configure.in,v 1.171 1999/04/23 02:57:14 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.170 $)dnl
+AC_REVISION($Revision: 1.171 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -1291,10 +1291,10 @@ statvfs("/tmp", &sfs);
   ac_cv_func_statvfs=yes,
   ac_cv_func_statvfs=no)
 AC_MSG_RESULT($ac_cv_func_statvfs)
-fi
-if test $ac_cv_func_statvfs = "yes" ; then
+if test "$ac_cv_func_statvfs" = "yes" ; then
   AC_DEFINE(HAVE_STATVFS)
 fi
+fi
 
 AC_CACHE_CHECK(for _res.nsaddr_list, ac_cv_have_res_nsaddr_list,
 AC_TRY_COMPILE([
diff --git a/lib/safe_inet_addr.c b/lib/safe_inet_addr.c
index 4af8c91335..bce337605a 100644
--- a/lib/safe_inet_addr.c
+++ b/lib/safe_inet_addr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: safe_inet_addr.c,v 1.8 1998/09/23 17:16:12 wessels Exp $
+ * $Id: safe_inet_addr.c,v 1.9 1999/04/23 02:57:15 wessels Exp $
  */
 
 #include "config.h"
@@ -35,7 +35,18 @@ safe_inet_addr(const char *buf, struct in_addr *addr)
     int a1 = 0, a2 = 0, a3 = 0, a4 = 0;
     struct in_addr A;
     char x;
+#if _SQUID_HPUX_
+    /*
+     * MIYOSHI Tsutomu <mijosxi@ike.tottori-u.ac.jp> says scanning 'buf'
+     * causes a bus error on hppa1.1-hp-hpux9.07, so we
+     * have a broad hack for all HP systems.
+     */
+    static char buftmp[32];
+    snprintf(buftmp, 32, "%s", buf);
+    if (sscanf(buftmp, "%d.%d.%d.%d%c", &a1, &a2, &a3, &a4, &x) != 4)
+#else
     if (sscanf(buf, "%d.%d.%d.%d%c", &a1, &a2, &a3, &a4, &x) != 4)
+#endif
 	return 0;
     if (a1 < 0 || a1 > 255)
 	return 0;
diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 5ef37cd6de..21ff9430b9 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpReply.cc,v 1.35 1999/01/22 19:07:00 glenn Exp $
+ * $Id: HttpReply.cc,v 1.36 1999/04/23 02:57:16 wessels Exp $
  *
  * DEBUG: section 58    HTTP Reply (Response)
  * AUTHOR: Alex Rousskov
@@ -198,7 +198,7 @@ MemBuf
 httpPacked304Reply(const HttpReply * rep)
 {
     static const http_hdr_type ImsEntries[] =
-    {HDR_DATE, HDR_CONTENT_LENGTH, HDR_CONTENT_TYPE, HDR_EXPIRES, HDR_LAST_MODIFIED, /* eof */ HDR_OTHER};
+    {HDR_DATE, HDR_CONTENT_TYPE, HDR_EXPIRES, HDR_LAST_MODIFIED, /* eof */ HDR_OTHER};
     int t;
     MemBuf mb;
     Packer p;
diff --git a/src/access_log.cc b/src/access_log.cc
index 334d571dec..346e26bc1b 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: access_log.cc,v 1.49 1999/01/29 18:31:17 wessels Exp $
+ * $Id: access_log.cc,v 1.50 1999/04/23 02:57:16 wessels Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -219,7 +219,7 @@ accessLogOpen(const char *fname)
     LogfileFD = file_open(LogfileName, O_WRONLY | O_CREAT, NULL, NULL, NULL);
     if (LogfileFD == DISK_ERROR) {
 	debug(50, 0) ("%s: %s\n", LogfileName, xstrerror());
-	fatal("Cannot open logfile.");
+	fatalf("Cannot open %s: %s", LogfileName, xstrerror());
     }
     LogfileStatus = LOG_ENABLE;
 }
@@ -327,7 +327,7 @@ accessLogRotate(void)
     if (LogfileFD == DISK_ERROR) {
 	debug(46, 0) ("accessLogRotate: Cannot open logfile: %s\n", fname);
 	LogfileStatus = LOG_DISABLE;
-	fatal("Cannot open logfile.");
+	fatalf("Cannot open %s: %s", fname, xstrerror());
     }
 }
 
diff --git a/src/acl.cc b/src/acl.cc
index cb9f26a90a..6ff02a1f47 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.200 1999/04/15 06:15:43 wessels Exp $
+ * $Id: acl.cc,v 1.201 1999/04/23 02:57:17 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -693,6 +693,7 @@ aclParseAclLine(acl ** head)
 	break;
     case ACL_URL_REGEX:
     case ACL_URLPATH_REGEX:
+    case ACL_BROWSER:
     case ACL_SRC_DOM_REGEX:
     case ACL_DST_DOM_REGEX:
 	aclParseRegexList(&A->data);
@@ -716,9 +717,6 @@ aclParseAclLine(acl ** head)
     case ACL_METHOD:
 	aclParseMethodList(&A->data);
 	break;
-    case ACL_BROWSER:
-	aclParseRegexList(&A->data);
-	break;
     case ACL_PROXY_AUTH:
 	aclParseWordList(&A->data);
 	if (!proxy_auth_cache) {
@@ -744,7 +742,7 @@ aclParseAclLine(acl ** head)
     }
     /*
      * Clear AclMatchedName from our temporary hack
-    */
+     */
     AclMatchedName = NULL;	/* ugly */
     if (!new_acl)
 	return;
@@ -1795,15 +1793,16 @@ aclDestroyAcls(acl ** head)
 	    break;
 	case ACL_URL_REGEX:
 	case ACL_URLPATH_REGEX:
+	case ACL_BROWSER:
 	case ACL_SRC_DOM_REGEX:
 	case ACL_DST_DOM_REGEX:
-	case ACL_BROWSER:
 	    aclDestroyRegexList(a->data);
 	    break;
 	case ACL_PROTO:
 	case ACL_METHOD:
 	case ACL_SRC_ASN:
 	case ACL_DST_ASN:
+	case ACL_NETDB_SRC_RTT:
 	    intlistDestroy((intlist **) & a->data);
 	    break;
 	case ACL_URL_PORT:
@@ -1811,7 +1810,7 @@ aclDestroyAcls(acl ** head)
 	    break;
 	case ACL_NONE:
 	default:
-	    assert(0);
+	    debug(28,1)("aclDestroyAcls: no case for ACL type %d\n", a->type);
 	    break;
 	}
 	safe_free(a->cfgline);
@@ -2118,6 +2117,8 @@ aclDumpGeneric(const acl * a)
 	break;
     case ACL_SRC_DOMAIN:
     case ACL_DST_DOMAIN:
+	return aclDumpDomainList(a->data);
+	break;
 #if SQUID_SNMP
     case ACL_SNMP_COMMUNITY:
 #endif
@@ -2125,7 +2126,7 @@ aclDumpGeneric(const acl * a)
     case ACL_IDENT:
 #endif
     case ACL_PROXY_AUTH:
-	return aclDumpDomainList(a->data);
+	return wordlistDup(a->data);
 	break;
     case ACL_TIME:
 	return aclDumpTimeSpecList(a->data);
@@ -2133,6 +2134,8 @@ aclDumpGeneric(const acl * a)
     case ACL_URL_REGEX:
     case ACL_URLPATH_REGEX:
     case ACL_BROWSER:
+    case ACL_SRC_DOM_REGEX:
+    case ACL_DST_DOM_REGEX:
 	return aclDumpRegexList(a->data);
 	break;
     case ACL_SRC_ASN:
@@ -2155,6 +2158,7 @@ aclDumpGeneric(const acl * a)
 #endif
     case ACL_NONE:
     default:
+	debug(28, 1) ("aclDumpGeneric: no case for ACL type %d\n", a->type);
 	break;
     }
     return NULL;
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 62c6889c3c..bce0281d60 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.326 1999/04/15 06:15:45 wessels Exp $
+ * $Id: cache_cf.cc,v 1.327 1999/04/23 02:57:18 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -118,6 +118,17 @@ wordlistCat(const wordlist * w, MemBuf * mb)
     }
 }
 
+wordlist *
+wordlistDup(const wordlist * w)
+{
+    wordlist *D = NULL;
+    while (NULL != w) {
+	wordlistAdd(&D, w->key);
+	w = w->next;
+    }
+    return D;
+}
+
 void
 intlistDestroy(intlist ** list)
 {
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 829cfe5dc5..f41a913065 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.147 1999/04/15 06:15:47 wessels Exp $
+# $Id: cf.data.pre,v 1.148 1999/04/23 02:57:19 wessels Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -35,8 +35,8 @@ COMMENT_START
 	------------------
 
 	This is the default Squid configuration file. You may wish
-	to look at http://cache.is.co.za/squid/ for documentation,
-	or the Squid home page (http://squid.nlanr.net/) for the FAQ.
+	to look at the Squid home page (http://squid.nlanr.net/)
+	for the FAQ and other documentation.
 
 	The default Squid config file shows what the defaults for
 	various options happen to be.  If you don't need to change the
@@ -92,6 +92,8 @@ DOC_START
 	and from neighbor caches.  Default is 4827.  To disable use
 	"0".
 
+	To enable this option, you must use --enable-htcp with the
+	configure script.
 htcp_port 4827
 DOC_END
 
@@ -777,6 +779,9 @@ DOC_START
 	acl ident_aware_hosts src 198.168.1.0/255.255.255.0
 	ident_lookup_access allow ident_aware_hosts
 	ident_lookup_access deny all
+
+	This option may be disabled by using --disable-ident with
+	the configure script.
 ident_lookup_access deny all
 DOC_END
 
@@ -1097,8 +1102,8 @@ DOC_START
 	description of Squid's refresh algorithm.  Basically a
 	cached object is: (the order is changed from 1.1.X)
 
-		STALE if age > max
 		FRESH if expires < now, else STALE
+		STALE if age > max
 		FRESH if lm-factor < percent, else STALE
 		FRESH if age < min
 		else STALE
@@ -1108,7 +1113,9 @@ DOC_START
 	match, then the default will be used.
 
 Default:
-refresh_pattern 	.	0 20% 4320
+refresh_pattern		^ftp:		1440	20%	10080
+refresh_pattern		^gopher:	1440	0%	1440
+refresh_pattern 	.		0	20%	4320
 DOC_END
 
 
@@ -1371,6 +1378,9 @@ DOC_START
 	and you enabled 'ident_lookup', then you might be susceptible
 	to denial-of-service by having many ident requests going at
 	once.
+
+	This option may be disabled by using --disable-ident with
+	the configure script.
 ident_timeout 10 seconds
 DOC_END
 
@@ -2202,6 +2212,8 @@ DOC_START
 	
 	see also refresh_pattern for a more selective approach.
 
+	This option may be disabled by using --disable-http-violations
+	with the configure script.
 reload_into_ims off
 DOC_END
 
@@ -2500,6 +2512,8 @@ DOC_START
 	if you have one class 2 delay pool and one class 3 delays pool, you
 	have a total of 2 delay pools.
 
+	To enable this option, you must use --enable-delay-pools with the
+	configure script.
 delay_pools 0
 DOC_END
 
diff --git a/src/comm.cc b/src/comm.cc
index b3aab7c316..5558c1875e 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.299 1999/01/18 22:23:32 wessels Exp $
+ * $Id: comm.cc,v 1.300 1999/04/23 02:57:20 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -325,7 +325,6 @@ commResetFD(ConnectStateData * cs)
     commSetCloseOnExec(cs->fd);
     if (Config.Addrs.tcp_outgoing.s_addr != no_addr.s_addr) {
 	if (commBind(cs->fd, Config.Addrs.tcp_outgoing, 0) != COMM_OK) {
-	    comm_close(cs->fd);
 	    return 0;
 	}
     }
diff --git a/src/errorpage.cc b/src/errorpage.cc
index fa1989032f..fd6c610d11 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.148 1999/01/29 21:01:06 wessels Exp $
+ * $Id: errorpage.cc,v 1.149 1999/04/23 02:57:21 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -546,7 +546,7 @@ errorConvert(char token, ErrorState * err)
 	p = "%";
 	break;
     default:
-	p = "%UNKNOWN%";
+	memBufPrintf(&mb, "%%%c", token);
 	break;
     }
     if (!p)
diff --git a/src/forward.cc b/src/forward.cc
index 8bf0b63cb6..32c44c6f3d 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.56 1999/04/15 06:15:55 wessels Exp $
+ * $Id: forward.cc,v 1.57 1999/04/23 02:57:22 wessels Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -136,6 +136,15 @@ fwdServerClosed(int fd, void *data)
 	debug(17, 3) ("fwdServerClosed: re-forwarding (%d tries, %d secs)\n",
 	    fwdState->n_tries,
 	    (int) (squid_curtime - fwdState->start));
+	if (fwdState->servers->next) {
+	    /* cycle */
+	    FwdServer *fs = fwdState->servers;
+	    FwdServer **T;
+	    fwdState->servers = fs->next;
+	    for (T = &fwdState->servers; *T; T = &(*T)->next);
+	    *T = fs;
+	    fs->next = NULL;
+	}
 	/* use eventAdd to break potential call sequence loops */
 	eventAdd("fwdConnectStart", fwdConnectStart, fwdState, 0.0, 1);
     } else {
diff --git a/src/ftp.cc b/src/ftp.cc
index 2b7f9452d7..2fe12f98fd 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.281 1999/04/15 06:15:56 wessels Exp $
+ * $Id: ftp.cc,v 1.282 1999/04/23 02:57:23 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1019,6 +1019,7 @@ ftpStart(FwdState * fwd)
     ftpState->ctrl.fd = fd;
     ftpState->data.fd = -1;
     ftpState->size = -1;
+    ftpState->mdtm = -1;
     ftpState->flags.pasv_supported = 1;
     ftpState->flags.rest_supported = 1;
     ftpState->fwd = fwd;
diff --git a/src/main.cc b/src/main.cc
index d100478b34..d81295fd11 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: main.cc,v 1.294 1999/04/19 05:00:19 wessels Exp $
+ * $Id: main.cc,v 1.295 1999/04/23 02:57:24 wessels Exp $
+ * $Id: main.cc,v 1.295 1999/04/23 02:57:24 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
diff --git a/src/mime.cc b/src/mime.cc
index bbaddfdf3c..a7080ce928 100644
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: mime.cc,v 1.85 1999/04/15 06:16:01 wessels Exp $
+ * $Id: mime.cc,v 1.86 1999/04/23 02:57:25 wessels Exp $
+ * $Id: mime.cc,v 1.86 1999/04/23 02:57:25 wessels Exp $
  *
  * DEBUG: section 25    MIME Parsing
  * AUTHOR: Harvest Derived
diff --git a/src/neighbors.cc b/src/neighbors.cc
index e0af86a7b1..a6b2fec418 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: neighbors.cc,v 1.271 1999/04/15 06:16:03 wessels Exp $
+ * $Id: neighbors.cc,v 1.272 1999/04/23 02:57:26 wessels Exp $
+ * $Id: neighbors.cc,v 1.272 1999/04/23 02:57:26 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
diff --git a/src/net_db.cc b/src/net_db.cc
index 3707d26d33..70f5d6227e 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: net_db.cc,v 1.137 1999/04/15 06:16:04 wessels Exp $
+ * $Id: net_db.cc,v 1.138 1999/04/23 02:57:27 wessels Exp $
+ * $Id: net_db.cc,v 1.138 1999/04/23 02:57:27 wessels Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
diff --git a/src/peer_select.cc b/src/peer_select.cc
index e5f62f5481..6707cb20df 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.98 1999/01/29 23:01:07 wessels Exp $
+ * $Id: peer_select.cc,v 1.99 1999/04/23 02:57:28 wessels Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -420,6 +420,8 @@ peerGetSomeParent(ps_state * ps)
     debug(44, 3) ("peerGetSomeParent: %s %s\n",
 	RequestMethodStr[request->method],
 	request->host);
+    if (ps->direct == DIRECT_YES)
+	return;
     if ((p = getDefaultParent(request))) {
 	code = DEFAULT_PARENT;
     } else if ((p = getRoundRobinParent(request))) {
diff --git a/src/pinger.cc b/src/pinger.cc
index f7b291966f..1248b60f7d 100644
--- a/src/pinger.cc
+++ b/src/pinger.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: pinger.cc,v 1.40 1999/04/15 06:16:05 wessels Exp $
+ * $Id: pinger.cc,v 1.41 1999/04/23 02:57:28 wessels Exp $
+ * $Id: pinger.cc,v 1.41 1999/04/23 02:57:28 wessels Exp $
  *
  * DEBUG: section 42    ICMP Pinger program
  * AUTHOR: Duane Wessels
diff --git a/src/protos.h b/src/protos.h
index c97cdfffad..2fdae6cabc 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,7 @@
 
 /*
- * $Id: protos.h,v 1.320 1999/04/19 05:01:24 wessels Exp $
+ * $Id: protos.h,v 1.321 1999/04/23 02:57:29 wessels Exp $
+ * $Id: protos.h,v 1.321 1999/04/23 02:57:29 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -95,6 +96,7 @@ extern int parseConfigFile(const char *file_name);
 extern void intlistDestroy(intlist **);
 extern int intlistFind(intlist * list, int i);
 extern wordlist *wordlistAdd(wordlist **, const char *);
+extern wordlist *wordlistDup(const wordlist *);
 extern void wordlistDestroy(wordlist **);
 extern void configFreeMemory(void);
 extern void wordlistCat(const wordlist *, MemBuf * mb);
@@ -859,7 +861,6 @@ extern void storeKeyFree(const cache_key *);
 extern const cache_key *storeKeyScan(const char *);
 extern const char *storeKeyText(const cache_key *);
 extern const cache_key *storeKeyPublic(const char *, const method_t);
-extern const cache_key *storeKeyPublicOld(const char *, const method_t);
 extern const cache_key *storeKeyPrivate(const char *, method_t, int);
 extern int storeKeyHashBuckets(int);
 extern int storeKeyNull(const cache_key *);
diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index ee004ded42..313c79aa80 100644
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.66 1999/04/15 06:16:07 wessels Exp $
+ * $Id: snmp_agent.cc,v 1.67 1999/04/23 02:57:31 wessels Exp $
+ * $Id: snmp_agent.cc,v 1.67 1999/04/23 02:57:31 wessels Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
diff --git a/src/squid.h b/src/squid.h
index 51312694fb..ba572d6aaf 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,7 @@
 
 /*
- * $Id: squid.h,v 1.187 1999/04/15 06:16:09 wessels Exp $
+ * $Id: squid.h,v 1.188 1999/04/23 02:57:32 wessels Exp $
+ * $Id: squid.h,v 1.188 1999/04/23 02:57:32 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
diff --git a/src/ssl.cc b/src/ssl.cc
index a81127b429..4919549325 100644
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: ssl.cc,v 1.93 1999/04/15 06:16:09 wessels Exp $
+ * $Id: ssl.cc,v 1.94 1999/04/23 02:57:33 wessels Exp $
+ * $Id: ssl.cc,v 1.94 1999/04/23 02:57:33 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
diff --git a/src/stat.cc b/src/stat.cc
index 35e2698ec2..ce8afc33a3 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: stat.cc,v 1.313 1999/04/16 01:00:52 wessels Exp $
+ * $Id: stat.cc,v 1.314 1999/04/23 02:57:34 wessels Exp $
+ * $Id: stat.cc,v 1.314 1999/04/23 02:57:34 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
diff --git a/src/store.cc b/src/store.cc
index 48fbbed00b..6422b04260 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: store.cc,v 1.489 1999/04/08 07:16:41 wessels Exp $
+ * $Id: store.cc,v 1.490 1999/04/23 02:57:36 wessels Exp $
+ * $Id: store.cc,v 1.490 1999/04/23 02:57:36 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -279,10 +280,7 @@ storeGet(const cache_key * key)
 StoreEntry *
 storeGetPublic(const char *uri, const method_t method)
 {
-    StoreEntry *e = storeGet(storeKeyPublic(uri, method));
-    if (e == NULL && squid_curtime < 922500000)
-	e = storeGet(storeKeyPublicOld(uri, method));
-    return e;
+    return storeGet(storeKeyPublic(uri, method));
 }
 
 static int
diff --git a/src/store_client.cc b/src/store_client.cc
index e62eddbfdf..1f49166653 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: store_client.cc,v 1.62 1999/04/15 06:16:11 wessels Exp $
+ * $Id: store_client.cc,v 1.63 1999/04/23 02:57:37 wessels Exp $
+ * $Id: store_client.cc,v 1.63 1999/04/23 02:57:37 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -135,6 +136,10 @@ storeClientListAdd(StoreEntry * e, void *data)
 #if DELAY_POOLS
     delayRegisterDelayIdPtr(&sc->delay_id);
 #endif
+#if DELAY_POOLS
+    sc->delay_id = 0;
+    delayRegisterDelayIdPtr(&sc->delay_id);
+#endif
 }
 
 static void
diff --git a/src/store_dir.cc b/src/store_dir.cc
index 3bd9261265..f772e91c79 100644
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: store_dir.cc,v 1.85 1999/04/15 06:16:12 wessels Exp $
+ * $Id: store_dir.cc,v 1.86 1999/04/23 02:57:37 wessels Exp $
+ * $Id: store_dir.cc,v 1.86 1999/04/23 02:57:37 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index def99d4e2c..ef85fbf21e 100644
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_key_md5.cc,v 1.20 1999/01/19 02:24:33 wessels Exp $
+ * $Id: store_key_md5.cc,v 1.21 1999/04/23 02:57:38 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager MD5 Cache Keys
  * AUTHOR: Duane Wessels
@@ -107,21 +107,6 @@ storeKeyPrivate(const char *url, method_t method, int id)
     return digest;
 }
 
-/*
- * Compatibility transition period.  Remove this after Mar 26, 1998
- */
-const cache_key *
-storeKeyPublicOld(const char *url, const method_t method)
-{
-    static cache_key digest[MD5_DIGEST_CHARS];
-    MD5_CTX M;
-    MD5Init(&M);
-    MD5Update(&M, (unsigned char *) &method, sizeof(method));
-    MD5Update(&M, (unsigned char *) url, strlen(url));
-    MD5Final(digest, &M);
-    return digest;
-}
-
 const cache_key *
 storeKeyPublic(const char *url, const method_t method)
 {
diff --git a/src/structs.h b/src/structs.h
index 521a50a7bc..d113e536c8 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,7 @@
 
 /*
- * $Id: structs.h,v 1.282 1999/04/19 04:45:07 wessels Exp $
+ * $Id: structs.h,v 1.283 1999/04/23 02:57:39 wessels Exp $
+ * $Id: structs.h,v 1.283 1999/04/23 02:57:39 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
diff --git a/src/tools.cc b/src/tools.cc
index 676ec8e22e..74e3d8148c 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: tools.cc,v 1.175 1999/04/15 06:03:09 wessels Exp $
+ * $Id: tools.cc,v 1.176 1999/04/23 02:57:40 wessels Exp $
+ * $Id: tools.cc,v 1.176 1999/04/23 02:57:40 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -186,7 +187,7 @@ rusage_maxrss(struct rusage *r)
     return r->ru_maxrss;
 #elif defined(BSD4_4)
     return r->ru_maxrss;
-#elif HAVE_GETPAGESIZE
+#elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
     return (r->ru_maxrss * getpagesize()) >> 10;
 #elif defined(PAGESIZE)
     return (r->ru_maxrss * PAGESIZE) >> 10;
@@ -298,8 +299,7 @@ static void
 fatal_common(const char *message)
 {
 #if HAVE_SYSLOG
-    if (opt_syslog_enable)
-	syslog(LOG_ALERT, "%s", message);
+    syslog(LOG_ALERT, "%s", message);
 #endif
     fprintf(debug_log, "FATAL: %s\n", message);
     if (opt_debug_stderr && debug_log != stderr)
diff --git a/src/tunnel.cc b/src/tunnel.cc
index de5b421c75..32867d1a96 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: tunnel.cc,v 1.93 1999/04/15 06:16:09 wessels Exp $
+ * $Id: tunnel.cc,v 1.94 1999/04/23 02:57:33 wessels Exp $
+ * $Id: tunnel.cc,v 1.94 1999/04/23 02:57:33 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index d68f87080c..d4e50f4c08 100644
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: unlinkd.cc,v 1.29 1998/12/02 05:07:26 wessels Exp $
+ * $Id: unlinkd.cc,v 1.30 1999/04/23 02:57:40 wessels Exp $
  *
  * DEBUG: section 12    Unlink Daemon
  * AUTHOR: Duane Wessels
@@ -32,30 +32,12 @@
  *
  */
 
+#include "squid.h"
+
 #ifdef UNLINK_DAEMON
 
 /* This is the external unlinkd process */
 
-#include "config.h"
-
-#if HAVE_LIBC_H
-#include <libc.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #define UNLINK_BUF_LEN 1024
 
 int
@@ -80,8 +62,6 @@ main(int argc, char *argv[])
 
 /* This code gets linked to Squid */
 
-#include "squid.h"
-
 #if USE_UNLINKD
 static int unlinkd_wfd = -1;
 static int unlinkd_rfd = -1;
diff --git a/src/url.cc b/src/url.cc
index 98ba8f0fe4..f8d0b2cafb 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,7 @@
 
 /*
- * $Id: url.cc,v 1.114 1999/04/15 06:16:13 wessels Exp $
+ * $Id: url.cc,v 1.115 1999/04/23 02:57:41 wessels Exp $
+ * $Id: url.cc,v 1.115 1999/04/23 02:57:41 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
diff --git a/src/urn.cc b/src/urn.cc
index 558cf2134d..808ab66319 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -1,7 +1,8 @@
 
 /*
  *
- * $Id: urn.cc,v 1.53 1999/04/15 06:16:14 wessels Exp $
+ * $Id: urn.cc,v 1.54 1999/04/23 02:57:42 wessels Exp $
+ * $Id: urn.cc,v 1.54 1999/04/23 02:57:42 wessels Exp $
  *
  * DEBUG: section 52    URN Parsing
  * AUTHOR: Kostas Anagnostakis