--- src/include/httpd.h.orig	Tue Jun 18 20:14:02 2002
+++ src/include/httpd.h	Mon Sep 23 14:33:40 2002
@@ -437,7 +437,8 @@
     SrvTk_MIN,		/* eg: Apache/1.3.0 */
     SrvTk_OS,		/* eg: Apache/1.3.0 (UNIX) */
     SrvTk_FULL,		/* eg: Apache/1.3.0 (UNIX) PHP/3.0 FooBar/1.2b */
-    SrvTk_PRODUCT_ONLY	/* eg: Apache */
+    SrvTk_PRODUCT_ONLY,	/* eg: Apache */
+    SrvTk_NONE		/* eg: Unknown */
 };
 
 API_EXPORT(const char *) ap_get_server_version(void);
--- src/main/http_main.c.orig	Wed Jun  5 06:53:15 2002
+++ src/main/http_main.c	Mon Sep 23 14:33:40 2002
@@ -451,6 +451,9 @@
     else if (ap_server_tokens == SrvTk_MIN) {
 	ap_add_version_component(SERVER_BASEVERSION);
     }
+    else if (ap_server_tokens == SrvTk_NONE) {
+	ap_add_version_component("Unknown");
+    }
     else {
 	ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
     }
--- src/main/http_core.c.orig	Tue Jun 18 02:59:57 2002
+++ src/main/http_core.c	Mon Sep 23 14:33:40 2002
@@ -2805,6 +2805,9 @@
     else if (!strcasecmp(arg, "Prod") || !strcasecmp(arg, "ProductOnly")) {
         ap_server_tokens = SrvTk_PRODUCT_ONLY;
     }
+    else if (!strcasecmp(arg, "None")) {
+        ap_server_tokens = SrvTk_NONE;
+    }
     else {
 	return ap_pstrcat(cmd->pool, "Unrecognised ServerTokens keyword: ",
 			  arg, NULL);
--- conf/httpd.conf-dist.orig	Tue Mar  5 17:19:12 2002
+++ conf/httpd.conf-dist	Mon Sep 23 14:33:40 2002
@@ -498,7 +498,13 @@
 # Set to "EMail" to also include a mailto: link to the ServerAdmin.
 # Set to one of:  On | Off | EMail
 #
-ServerSignature On
+ServerSignature Off
+
+#
+# Control of the information leaked in the "Server:" HTTP header, among "None",
+# "ProductOnly", "Minimal", "OS", "Full"
+#
+ServerTokens None
 
 # EBCDIC configuration:
 # (only for mainframes using the EBCDIC codeset, currently one of: