]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
change to SQUID_VERSION
authorwessels <>
Fri, 23 Feb 1996 12:41:20 +0000 (12:41 +0000)
committerwessels <>
Fri, 23 Feb 1996 12:41:20 +0000 (12:41 +0000)
src/cachemgr.cc
src/dnsserver.cc
src/ftp.cc
src/gopher.cc
src/http.cc
src/main.cc
src/send-announce.cc
src/stat.cc
src/store.cc
src/tools.cc
src/wais.cc

index 7e65a7d055216caaee5fb72962829a9b4a903f3a..e55e26986c6b85cc713bac38818d2feff7fe6d29 100644 (file)
@@ -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");
 }
 
index 72adad0f06a568a6e5c2d4706099ea9bd10bce62..b21b9bd8540bcb80c03af729cc362153ebc504ee 100644 (file)
@@ -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':
index b829795d7b97a81430d26129d8948d041782e09b..bfead853efb0cfee4b606279f0383317cbb22add 100644 (file)
@@ -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
index d2116dd7c74ff474f03fc923e220c80e4348d551..a1ad40662001544a1ee38a5904cd1644469592aa 100644 (file)
@@ -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
index efda8a1cb079b381734305908ffed1431fe7def1..0adc54509f4f23d21742e6affda81ca188b721ce 100644 (file)
@@ -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
index 85cd7a08440dae2db2e8aec49ee4f1afe5fef42e..eefebe2c708294da430f389fa729fb00a6e6c9fe 100644 (file)
@@ -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();
index 64dc50ece3de379d29c3f608225a2e124161616f..e1dd4023c80d55bdff4bbbff08a527e918c59250 100644 (file)
@@ -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(),
index 1381f2eb4ae9dcfa327495e45b5034b7dd383e11..96b261072c78851e413dbf2b811f83a5f7ef9050 100644 (file)
@@ -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);
index 27871692609dde3e47fcc58308148e8c1d12d29f..dc84721534283ed8cbe66c0d8f9753625fc6c6c7 100644 (file)
@@ -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;
index 142088b5f2a091e665a1087444154a75bb46e009..9891cdddf165c50b8db3a35c47ddf47c52d6026e 100644 (file)
@@ -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);
     }
 }
 
index dabd9888f41afdc7e6e23da8548ee30efbc8b154..6683ce6a1b4a92a0663d2fa8f8ca06483853f1ec 100644 (file)
@@ -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