From: Ryan Bloom <rbb@apache.org>
Date: Mon, 5 Jun 2000 22:57:20 +0000 (+0000)
Subject: Fix a warning and a bug from the server_token commit.
X-Git-Tag: APACHE_2_0_ALPHA_5~437
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=150c8bcd647595bad144b44536a274f20cf216f2;p=thirdparty%2Fapache%2Fhttpd.git

Fix a warning and a bug from the server_token commit.
Submitted by:	Eric Cholet <cholet@logilune.com>


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

diff --git a/include/httpd.h b/include/httpd.h
index 33ee09100be..3831c3e2834 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -373,7 +373,7 @@ enum server_token_type {
 };
 
 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(void) ap_add_version_component(ap_pool_t *pconf, const char *component);
 API_EXPORT(const char *) ap_get_server_built(void);
 
 /* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 460c3a2f3a9..0843b35356d 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2049,6 +2049,7 @@ static ap_status_t reset_version(void *dummy)
     version_locked = 0;
     ap_server_tokens = SrvTk_FULL;
     server_version = NULL;
+    return APR_SUCCESS;
 }
 
 API_EXPORT(const char *) ap_get_server_version(void)