Common subdirectories: src.orig/auth and src/auth
diff -u src.orig/cf.data.pre src/cf.data.pre
--- src.orig/cf.data.pre	2004-02-01 15:13:53.000000000 -0500
+++ src/cf.data.pre	2004-02-01 15:15:33.000000000 -0500
@@ -53,6 +53,15 @@
  -----------------------------------------------------------------------------
 COMMENT_END
 
+NAME: httpd_suppress_version_string
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.httpd_suppress_version_string
+DOC_START
+	Suppress Squid version string info in HTTP headers and HTML error pages.
+DOC_END
+
 NAME: http_port ascii_port
 TYPE: sockaddr_in_list
 DEFAULT: none
diff -u src.orig/errorpage.c src/errorpage.c
--- src.orig/errorpage.c	2004-02-01 15:13:53.000000000 -0500
+++ src/errorpage.c	2004-02-01 15:14:00.000000000 -0500
@@ -66,7 +66,7 @@
 	    "\n<BR clear=\"all\">\n"
 	    "<HR noshade size=\"1px\">\n"
 	    "<ADDRESS>\n"
-	    "Generated %T by %h (%s)\n"
+	    "Generated %T %s on %h\n"
 	    "</ADDRESS>\n"
 	    "</BODY></HTML>\n"
     },
@@ -537,8 +537,11 @@
 	}
 	break;
     case 's':
-	p = full_appname_string;
-	break;
+			if(!Config.onoff.httpd_suppress_version_string)
+				p = full_appname_string;
+			else
+				p = "";
+			break;
     case 'S':
 	/* signature may contain %-escapes, recursion */
 	if (err->page_id != ERR_SQUID_SIGNATURE) {
Common subdirectories: src.orig/fs and src/fs
diff -u src.orig/HttpReply.c src/HttpReply.c
--- src.orig/HttpReply.c	2004-02-01 15:13:53.000000000 -0500
+++ src/HttpReply.c	2004-02-01 15:14:00.000000000 -0500
@@ -235,7 +235,8 @@
     assert(reply);
     httpStatusLineSet(&reply->sline, ver, status, reason);
     hdr = &reply->header;
-    httpHeaderPutStr(hdr, HDR_SERVER, full_appname_string);
+		if(!Config.onoff.httpd_suppress_version_string)
+			httpHeaderPutStr(hdr, HDR_SERVER, full_appname_string);
     httpHeaderPutStr(hdr, HDR_MIME_VERSION, "1.0");
     httpHeaderPutTime(hdr, HDR_DATE, squid_curtime);
     if (ctype) {
Common subdirectories: src.orig/repl and src/repl
diff -u src.orig/structs.h src/structs.h
--- src.orig/structs.h	2004-02-01 15:13:53.000000000 -0500
+++ src/structs.h	2004-02-01 15:14:00.000000000 -0500
@@ -552,6 +552,7 @@
 	time_t period;
     } Netdb;
     struct {
+	int httpd_suppress_version_string;
 	int log_udp;
 #if USE_DNSSERVERS
 	int res_defnames;