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 33ee09100be7487e0321469fa95825d414e23790..3831c3e2834e61c797cc65249f5ea6d2d5e99fd7 100644 (file)
--- 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 460c3a2f3a9b6c57fac4e3e5411a702883f6deff..0843b35356de42f1d806839a04365440d4d607eb 100644 (file)
--- 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)