On the trunk:

adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves
     building mod_ssl on Windows.

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

diff --git a/CHANGES b/CHANGES
index 0f1e92c3f5c0e2689ad85e3d5282564062f2192a..bdd3073ea66f850253ba76ba93c5dcd82ed1d7d6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves
+     building mod_ssl on Windows. [Stefan Eissing, Gregg Smith]
+
   *) mod_http2: removed obsolete stream detach code, no longer generating events
      in beam shutdown on pool destroy. [Stefan Eissing]
      

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index bcbdb7eaa0763c947e0df353e104abe5bd8b6373..d2921cf06e3b2f32bb8d3d871b801ebeeea63b13 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -561,6 +561,7 @@
  *                         semantics
  * 20171014.2 (2.5.1-dev)  Add "use_specific_errors" to listen_rec and 
  *                         ap_accept_error_is_nonfatal()
+ * 20171014.3 (2.5.1-dev)  AP_DECLARE ap_parse_vhost_addrs() as public 
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -568,7 +569,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20171014
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 2                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 3                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/http_vhost.h b/include/http_vhost.h
index 473c9c7d1e92dc3b9249bb675a48e73b138fde74..3941c2b22c13f172b89eded13ca82a45c8cead87 100644 (file)
--- a/include/http_vhost.h
+++ b/include/http_vhost.h
@@ -50,7 +50,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_server);
  * @param hostname The hostname in the VirtualHost statement
  * @param s The list of Virtual Hosts.
  */
-const char *ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s);
+AP_DECLARE(const char *) ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s);
 
 /**
  * handle NameVirtualHost directive

diff --git a/server/vhost.c b/server/vhost.c
index ac6d3a605b96f221242b923925c9c1c2bd1a0bc3..f71deb49488856fe023010121ff238445095e0e4 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -238,9 +238,9 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,
 
 
 /* parse the <VirtualHost> addresses */
-const char *ap_parse_vhost_addrs(apr_pool_t *p,
-                                 const char *hostname,
-                                 server_rec *s)
+AP_DECLARE(const char *)ap_parse_vhost_addrs(apr_pool_t *p,
+                                             const char *hostname,
+                                             server_rec *s)
 {
     server_addr_rec **addrs;
     const char *err;