From: Ryan Bloom <rbb@apache.org>
Date: Sat, 29 Jul 2000 19:50:08 +0000 (+0000)
Subject: Move the Server Token stuff out of http_config_globals.h because it is
X-Git-Tag: APACHE_2_0_ALPHA_5~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe642310232fad997b7bbe921ed1e89a6e58d017;p=apache

Move the Server Token stuff out of http_config_globals.h because it is
now isolated in http_core.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85941 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/http_conf_globals.h b/include/http_conf_globals.h
index 051d8a809c..73fa4d9b65 100644
--- a/include/http_conf_globals.h
+++ b/include/http_conf_globals.h
@@ -65,8 +65,6 @@ extern "C" {
 
 /* TODO: this file should be deleted after the other todos are dealt with */
 
-/* TODO: extern enum server_token_type ap_server_tokens; */
-
 /* TODO: extern int ap_configtestonly;  ... although it pains me because this breaks an abstraction */
 /* TODO: extern int ap_docrootcheck; */
 
diff --git a/include/httpd.h b/include/httpd.h
index 2c2f5ed20b..763619bb68 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -365,13 +365,6 @@ extern "C" {
 #define APEXIT_CHILDINIT	0x3
 #define APEXIT_CHILDFATAL	0xf
 
-enum server_token_type {
-    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 */
-};
-
 API_EXPORT(const char *) ap_get_server_version(void);
 API_EXPORT(void) ap_add_version_component(ap_pool_t *pconf, const char *component);
 API_EXPORT(const char *) ap_get_server_built(void);
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 102a88f58c..1ab446eae2 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2209,6 +2209,13 @@ static const char *set_bs2000_account(cmd_parms *cmd, void *dummy, char *name)
 
 static char *server_version = NULL;
 static int version_locked = 0; 
+
+enum server_token_type {
+    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 */
+};
 static enum server_token_type ap_server_tokens = SrvTk_FULL;
 
 static ap_status_t reset_version(void *dummy)