Add server tokens back to 2.0. Also bring forward the change to allow

the PRODUCT_ONLY value for ServerTokens.  This is relatively clean,
all of the code lives in http_core, and when a module wants to add a token,
they just call ap_add_version_component from the post_config hook.  Actually
ap_add_version_component can be done anytime after the config has been
parsed, it just makes the most sense to do it in post_config IMHO.


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

3 files changed, 0 insertions, 10 deletions

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index f360585e12..aadc7cf00f 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -164,9 +164,6 @@ static ap_lock_t *process_accept_mutex;
 static char *lock_fname;
 static pthread_mutex_t thread_accept_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/* Global, alas, so http_core can talk to us */
-enum server_token_type ap_server_tokens = SrvTk_FULL;
-
 API_EXPORT(const server_rec *) ap_get_server_conf(void)
 {
     return (ap_server_conf);
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index c7e5b80145..2e8229c5a0 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -139,9 +139,6 @@ static int one_process = 0;
 int raise_sigstop_flags;
 #endif
 
-/* Global, alas, so http_core can talk to us */
-enum server_token_type ap_server_tokens = SrvTk_FULL;
-
 API_EXPORT(const server_rec *) ap_get_server_conf(void)
 {
     return (ap_server_conf);
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index cb1278e990..94bbed9c2c 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -161,10 +161,6 @@ static char *lock_fname;
 #define SAFE_ACCEPT(stmt) (stmt)
 #endif
 
-
-/* Global, alas, so http_core can talk to us */
-enum server_token_type ap_server_tokens = SrvTk_FULL;
-
 API_EXPORT(const server_rec *) ap_get_server_conf(void)
 {
     return (ap_server_conf);