From: Stefan Fritsch <sf@apache.org>
Date: Wed, 13 Jul 2011 19:21:11 +0000 (+0000)
Subject: Use APR_UNSPEC to allow startup on IP6-only systems.
X-Git-Tag: 2.3.14^2~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=527d18b6ca50c41db14c18ac4af93179f31507dd;p=thirdparty%2Fapache%2Fhttpd.git

Use APR_UNSPEC to allow startup on IP6-only systems.

PR: 50592
Submitted by: Joe Orton, 2510 <root linkage white-void net>


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

diff --git a/CHANGES b/CHANGES
index 8273becd575..7f92cacf048 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.14
 
+  *) core: Fix startup on IP6-only systems. PR 50592. [Joe Orton,
+     <root linkage white-void net>]
+
   *) suexec: Add environment variables CONTEXT_DOCUMENT_ROOT, CONTEXT_PREFIX,
      REDIRECT_ERROR_NOTES, REDIRECT_SCRIPT_FILENAME, REQUEST_SCHEME to the
      whitelist in suexec. PR 51499. [Graham Laverty <graham reg ca>,
diff --git a/server/config.c b/server/config.c
index 8f78f1f4ce3..cf379d426a6 100644
--- a/server/config.c
+++ b/server/config.c
@@ -2255,7 +2255,7 @@ static server_rec *init_server_config(process_rec *process, apr_pool_t *p)
 
     /* NOT virtual host; don't match any real network interface */
     rv = apr_sockaddr_info_get(&s->addrs->host_addr,
-                               NULL, APR_INET, 0, 0, p);
+                               NULL, APR_UNSPEC, 0, 0, p);
     if (rv != APR_SUCCESS) {
         /* should we test here for rv being an EAIERR? */
         ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, rv, NULL,