From: wessels <>
Date: Fri, 23 Feb 1996 12:41:20 +0000 (+0000)
Subject: change to SQUID_VERSION
X-Git-Tag: SQUID_3_0_PRE1~6432
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73a5465f76a07cc46874413e37c653d2fef75a7e;p=thirdparty%2Fsquid.git

change to SQUID_VERSION
---

diff --git a/src/cachemgr.cc b/src/cachemgr.cc
index 7e65a7d055..e55e26986c 100644
--- a/src/cachemgr.cc
+++ b/src/cachemgr.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: cachemgr.cc,v 1.1 1996/02/22 06:23:53 wessels Exp $";
+static char rcsid[] = "$Id: cachemgr.cc,v 1.2 1996/02/23 05:41:20 wessels Exp $";
 /*
  *  cachemgr.c - CGI interface to the Cache Manager.
  *
@@ -109,7 +109,7 @@ void print_trailer()
     printf("<HR>\n");
     printf("<ADDRESS>\n");
     printf("Generated %s, by %s/%s@%s\n",
-	tbuf, progname, HARVEST_VERSION, getfullhostname());
+	tbuf, progname, SQUID_VERSION, getfullhostname());
     printf("</ADDRESS>\n");
 }
 
diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index 72adad0f06..b21b9bd854 100644
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: dnsserver.cc,v 1.1 1996/02/22 06:23:54 wessels Exp $";
+static char rcsid[] = "$Id: dnsserver.cc,v 1.2 1996/02/23 05:41:21 wessels Exp $";
 /*
  *  File:         dnsserver.c
  *  Description:  dnsserver process for non-blocking DNS lookup.
@@ -166,7 +166,7 @@ int main(argc, argv)
 	switch (c) {
 	case 'v':
 	case 'h':
-	    printf("dnsserver version %s\n", HARVEST_VERSION);
+	    printf("dnsserver version %s\n", SQUID_VERSION);
 	    exit(0);
 	    break;
 	case 'd':
diff --git a/src/ftp.cc b/src/ftp.cc
index b829795d7b..bfead853ef 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: ftp.cc,v 1.1 1996/02/22 06:23:54 wessels Exp $";
+static char rcsid[] = "$Id: ftp.cc,v 1.2 1996/02/23 05:41:22 wessels Exp $";
 /* 
  *  File:         ftp.c
  *  Description:  state machine for ftp retrieval protocol.  Based on John's
@@ -218,7 +218,7 @@ void ftpLifetimeExpire(fd, data)
 	210,
 	"Transaction Timeout",
 	"The Network/Remote site may be down or too slow.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     ftp_close_pipe(data->ftp_fd, data->cpid);
@@ -277,7 +277,7 @@ int ftpReadReply(fd, data)
 		319,
 		"No Client",
 		"All Clients went away before tranmission is complete and object is too big to cache.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	    ftp_close_pipe(data->ftp_fd, data->cpid);
@@ -307,7 +307,7 @@ int ftpReadReply(fd, data)
 	    305,
 	    "Read Error.",
 	    "Network/Remote Site is down.  Try again later.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	ftp_close_pipe(data->ftp_fd, data->cpid);
@@ -357,7 +357,7 @@ int ftpReadReply(fd, data)
 	    307,
 	    "Client Aborted",
 	    "Client(s) dropped connection before transmission is complete.\nObject fetching is aborted.\n",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	ftp_close_pipe(data->ftp_fd, data->cpid);
@@ -435,7 +435,7 @@ int ftpStart(unusedfd, url, entry)
 	    309,
 	    "Invalid URL syntax: Cannot parse.",
 	    "Please contact your system manager for further help.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -470,7 +470,7 @@ int ftpStart(unusedfd, url, entry)
 	    308,
 	    "Cannot connect to FTP slave process",
 	    "Please contact your system manager for further help.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
diff --git a/src/gopher.cc b/src/gopher.cc
index d2116dd7c7..a1ad406620 100644
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: gopher.cc,v 1.1 1996/02/22 06:23:54 wessels Exp $";
+static char rcsid[] = "$Id: gopher.cc,v 1.2 1996/02/23 05:41:23 wessels Exp $";
 /* 
  * File:         gopher.c
  * Description:  state machine for gopher retrieval protocol.  Based on Anawat's
@@ -230,7 +230,7 @@ void gopherMimeCreate(data)
     sprintf(tempMIME, "\
 HTTP/1.0 200 OK Gatewaying\r\n\
 Server: HarvestCache/%s\r\n\
-MIME-version: 1.0\r\n", HARVEST_VERSION);
+MIME-version: 1.0\r\n", SQUID_VERSION);
 
     switch (data->type_id) {
 
@@ -671,7 +671,7 @@ int gopherReadReplyTimeout(fd, data)
 	203,
 	"Read timeout",
 	"Network/Remote site may be down.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     if (data->icp_page_ptr)
@@ -706,7 +706,7 @@ void gopherLifetimeExpire(fd, data)
 	210,
 	"Transaction Timeout",
 	"The Network/Remote site may be down or too slow.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     if (data->icp_page_ptr)
@@ -783,7 +783,7 @@ int gopherReadReply(fd, data)
 		219,
 		"No Client",
 		"All Clients went away before tranmission is complete and object is too big to cache.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	    comm_close(fd);
@@ -813,7 +813,7 @@ int gopherReadReply(fd, data)
 	    205,
 	    "Read error",
 	    "Network/Remote Site is down.  Try again later.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	comm_close(fd);
@@ -867,7 +867,7 @@ int gopherReadReply(fd, data)
 	    207,
 	    "Client Aborted",
 	    "Client(s) dropped connection before transmission is complete.\nObject fetching is aborted.\n",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	if (data->conversion != NORMAL)
 	    gopherEndHTML(data);
@@ -919,7 +919,7 @@ int gopherSendComplete(fd, buf, size, errflag, data)
 	    201,
 	    "Cannot connect to the original site",
 	    "The remote site may be down.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	comm_close(fd);
@@ -1049,7 +1049,7 @@ int gopherStart(unusedfd, url, entry)
 	    208,
 	    "Invalid URL syntax: Cannot parse.",
 	    "Contact your system adminstrator for further help.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -1075,7 +1075,7 @@ int gopherStart(unusedfd, url, entry)
 	    211,
 	    "Cached short of file-descriptors, sorry",
 	    "",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -1102,7 +1102,7 @@ int gopherStart(unusedfd, url, entry)
 	    202,
 	    "DNS name lookup failure",
 	    dns_error_message,
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -1149,7 +1149,7 @@ int gopherStart(unusedfd, url, entry)
 		204,
 		"Cannot connect to the original site",
 		"The remote site may be down.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
diff --git a/src/http.cc b/src/http.cc
index efda8a1cb0..0adc54509f 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: http.cc,v 1.1 1996/02/22 06:23:55 wessels Exp $";
+static char rcsid[] = "$Id: http.cc,v 1.2 1996/02/23 05:41:24 wessels Exp $";
 /* 
  *  File:         http.c
  *  Description:  state machine for http retrieval protocol.  
@@ -196,7 +196,7 @@ void httpReadReplyTimeout(fd, data)
 	103,
 	"Read timeout",
 	"The Network/Remote site may be down.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
 
     if (data->icp_rwd_ptr)
@@ -236,7 +236,7 @@ void httpLifetimeExpire(fd, data)
 	110,
 	"Transaction Timeout",
 	"The Network/Remote site may be down or too slow.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
 
     if (data->icp_page_ptr) {
@@ -317,7 +317,7 @@ void httpReadReply(fd, data)
 		119,
 		"No Client",
 		"All Clients went away before tranmission is complete and object is too big to cache.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	    comm_close(fd);
@@ -356,7 +356,7 @@ void httpReadReply(fd, data)
 		105,
 		"Read error",
 		"Network/Remote site is down.  Try again later.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	}
@@ -398,7 +398,7 @@ void httpReadReply(fd, data)
 	    107,
 	    "Client Aborted",
 	    "Client(s) dropped connection before transmission is complete.\nObject fetching is aborted.\n",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	comm_close(fd);
@@ -450,7 +450,7 @@ void httpSendComplete(fd, buf, size, errflag, data)
 	    101,
 	    "Cannot connect to the original site",
 	    "The remote site may be down.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	comm_close(fd);
@@ -519,7 +519,7 @@ void httpSendRequest(fd, data)
 	    if (strncasecmp(t, "User-Agent:", 11) == 0) {
 		ybuf = (char *) get_free_4k_page();
 		memset(ybuf, '\0', SM_PAGE_SIZE);
-		sprintf(ybuf, "%s %s %s", t, HARVEST_PROXY_TEXT, HARVEST_VERSION);
+		sprintf(ybuf, "%s %s %s", t, HARVEST_PROXY_TEXT, SQUID_VERSION);
 		t = ybuf;
 	    }
 	    if (strncasecmp(t, "If-Modified-Since:", 18) == 0)
@@ -574,7 +574,7 @@ void httpConnInProgress(fd, data)
 		104,
 		"Cannot connect to the original site",
 		"The remote site may be down.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -630,7 +630,7 @@ int proxyhttpStart(e, url, entry)
 	    111,
 	    "Cached short of file-descriptors, sorry",
 	    "",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -657,7 +657,7 @@ int proxyhttpStart(e, url, entry)
 	    102,
 	    "DNS name lookup failure",
 	    dns_error_message,
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -682,7 +682,7 @@ int proxyhttpStart(e, url, entry)
 		104,
 		"Cannot connect to the original site",
 		"The remote site may be down.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -744,7 +744,7 @@ int httpStart(unusedfd, url, type, mime_hdr, entry)
 	    110,
 	    "Invalid URL syntax:  Cannot parse.",
 	    "Contact your system administrator for further help.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -769,7 +769,7 @@ int httpStart(unusedfd, url, type, mime_hdr, entry)
 	    111,
 	    "Cached short of file-descriptors, sorry",
 	    "",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -796,7 +796,7 @@ int httpStart(unusedfd, url, type, mime_hdr, entry)
 	    108,
 	    "DNS name lookup failure",
 	    dns_error_message,
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -821,7 +821,7 @@ int httpStart(unusedfd, url, type, mime_hdr, entry)
 		109,
 		"Cannot connect to the original site",
 		"The remote site may be down.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
diff --git a/src/main.cc b/src/main.cc
index 85cd7a0844..eefebe2c70 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: main.cc,v 1.1 1996/02/22 06:23:55 wessels Exp $";
+static char rcsid[] = "$Id: main.cc,v 1.2 1996/02/23 05:41:25 wessels Exp $";
 /* 
  *  File:         main.c
  *  Description:  main loop for cache
@@ -246,7 +246,7 @@ int main(argc, argv)
     while ((c = getopt(argc, argv, "vCDRVseif:a:p:u:d:m:zh?")) != -1)
 	switch (c) {
 	case 'v':
-	    printf("Harvest Cache: Version %s\n", HARVEST_VERSION);
+	    printf("Harvest Cache: Version %s\n", SQUID_VERSION);
 	    exit(0);
 	    /* NOTREACHED */
 	case 'V':
@@ -359,7 +359,7 @@ Usage: cached [-Rsehvz] [-f config-file] [-d debug-level] [-[apu] port]\n\
     fdstat_open(fileno(debug_log), LOG);
     fd_note(fileno(debug_log), getCacheLogFile());
 
-    debug(0, "Starting Harvest Cache (version %s)...\n", HARVEST_VERSION);
+    debug(0, "Starting Harvest Cache (version %s)...\n", SQUID_VERSION);
 
     /* init ipcache */
     ipcache_init();
diff --git a/src/send-announce.cc b/src/send-announce.cc
index 64dc50ece3..e1dd4023c8 100644
--- a/src/send-announce.cc
+++ b/src/send-announce.cc
@@ -82,7 +82,7 @@ int send_packet(host, port)
     struct sockaddr_in L;
     struct hostent *hp = NULL;
 
-    sprintf(buf, "cache_version HARVEST/%s\n", HARVEST_VERSION);
+    sprintf(buf, "cache_version HARVEST/%s\n", SQUID_VERSION);
     strcat(databuf, buf);
     sprintf(buf, "Running on %s %d %d\n",
 	getfullhostname(),
diff --git a/src/stat.cc b/src/stat.cc
index 1381f2eb4a..96b261072c 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: stat.cc,v 1.1 1996/02/22 06:23:55 wessels Exp $";
+static char rcsid[] = "$Id: stat.cc,v 1.2 1996/02/23 05:41:27 wessels Exp $";
 /* 
  *  File:         stat.c
  *  Description:  stat module for object cache
@@ -520,7 +520,7 @@ void info_get(obj, sentry)
 
     storeAppend(sentry, open_bracket, (int) strlen(open_bracket));
 
-    sprintf(line, "{Harvest Object Cache: Version %s}\n", HARVEST_VERSION);
+    sprintf(line, "{Harvest Object Cache: Version %s}\n", SQUID_VERSION);
     storeAppend(sentry, line, strlen(line));
 
     tod = mkrfc850(&cached_starttime);
diff --git a/src/store.cc b/src/store.cc
index 2787169260..dc84721534 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: store.cc,v 1.1 1996/02/22 06:23:55 wessels Exp $";
+static char rcsid[] = "$Id: store.cc,v 1.2 1996/02/23 05:41:28 wessels Exp $";
 /* 
  *  File:         store.c
  *  Description:  Storage manager for the Cache
@@ -2640,7 +2640,7 @@ int swapInError(fd_unused, entry)
 	102,
 	"Cache Disk I/O Failure",
 	"",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     return 0;
diff --git a/src/tools.cc b/src/tools.cc
index 142088b5f2..9891cdddf1 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: tools.cc,v 1.1 1996/02/22 06:23:56 wessels Exp $";
+static char rcsid[] = "$Id: tools.cc,v 1.2 1996/02/23 05:41:28 wessels Exp $";
 /*
  **********************************************************************
  *  Copyright (c) 1994, 1995.  All rights reserved.
@@ -155,7 +155,7 @@ Thanks!\n"
 static char *dead_msg()
 {
     static char msg[1024];
-    sprintf(msg, DEAD_MSG, HARVEST_VERSION, HARVEST_VERSION);
+    sprintf(msg, DEAD_MSG, SQUID_VERSION, SQUID_VERSION);
     return msg;
 }
 
@@ -209,7 +209,7 @@ void shut_down(sig)
     storeWriteCleanLog();
     PrintRusage(NULL, stderr);
     debug(0, "Harvest Cache (Version %s): Exiting due to signal %d.\n",
-	HARVEST_VERSION, sig);
+	SQUID_VERSION, sig);
     exit(1);
 }
 
@@ -220,13 +220,13 @@ void fatal_common(message)
 	syslog(LOG_ALERT, message);
     fprintf(stderr, "FATAL: %s\n", message);
     fprintf(stderr, "Harvest Cache (Version %s): Terminated abnormally.\n",
-	HARVEST_VERSION);
+	SQUID_VERSION);
     fflush(stderr);
     PrintRusage(NULL, stderr);
     if (debug_log != stderr) {
 	debug(0, "FATAL: %s\n", message);
 	debug(0, "Harvest Cache (Version %s): Terminated abnormally.\n",
-	    HARVEST_VERSION);
+	    SQUID_VERSION);
     }
 }
 
diff --git a/src/wais.cc b/src/wais.cc
index dabd9888f4..6683ce6a1b 100644
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: wais.cc,v 1.1 1996/02/22 06:23:56 wessels Exp $";
+static char rcsid[] = "$Id: wais.cc,v 1.2 1996/02/23 05:41:29 wessels Exp $";
 /*
  *  File:         wais.c
  *  Description:  state machine for wais retrieval protocol (just open a
@@ -145,7 +145,7 @@ void waisReadReplyTimeout(fd, data)
 	403,
 	"Read timeout",
 	"The Network/Remote site may be down.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     comm_set_select_handler(fd, COMM_SELECT_READ, 0, 0);
@@ -177,7 +177,7 @@ void waisLifetimeExpire(fd, data)
 	410,
 	"Transaction Timeout",
 	"The Network/Remote site may be down or too slow.  Try again later.",
-	HARVEST_VERSION,
+	SQUID_VERSION,
 	comm_hostname());
     storeAbort(entry, tmp_error_buf);
     comm_set_select_handler(fd, COMM_SELECT_READ | COMM_SELECT_WRITE, 0, 0);
@@ -232,7 +232,7 @@ void waisReadReply(fd, data)
 		419,
 		"No Client",
 		"All Clients went away before tranmission is complete and object is too big to cache.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	    comm_close(fd);
@@ -270,7 +270,7 @@ void waisReadReply(fd, data)
 		405,
 		"Read error",
 		"Network/Remote site is down.  Try again later.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 	}
@@ -329,7 +329,7 @@ void waisSendComplete(fd, buf, size, errflag, data)
 	    401,
 	    "Cannot connect to the original site",
 	    "The remote site may be down.",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 	comm_close(fd);
@@ -406,7 +406,7 @@ int waisStart(unusedfd, url, type, mime_hdr, entry)
 	    412,
 	    "Configuration error.  No WAIS relay host is defined.",
 	    "",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -436,7 +436,7 @@ int waisStart(unusedfd, url, type, mime_hdr, entry)
 	    411,
 	    "Cached short of file-descriptors, sorry",
 	    "",
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -463,7 +463,7 @@ int waisStart(unusedfd, url, type, mime_hdr, entry)
 	    402,
 	    "DNS name lookup failure",
 	    dns_error_message,
-	    HARVEST_VERSION,
+	    SQUID_VERSION,
 	    comm_hostname());
 	storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS
@@ -488,7 +488,7 @@ int waisStart(unusedfd, url, type, mime_hdr, entry)
 		401,
 		"Cannot connect to the original site",
 		"The remote site may be down.",
-		HARVEST_VERSION,
+		SQUID_VERSION,
 		comm_hostname());
 	    storeAbort(entry, tmp_error_buf);
 #ifdef LOG_ERRORS