]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Use APR_UNSPEC to allow startup on IP6-only systems.
authorStefan Fritsch <sf@apache.org>
Wed, 13 Jul 2011 19:21:11 +0000 (19:21 +0000)
committerStefan Fritsch <sf@apache.org>
Wed, 13 Jul 2011 19:21:11 +0000 (19:21 +0000)
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

CHANGES
server/config.c

diff --git a/CHANGES b/CHANGES
index 8273becd575d128cd37d7e5c25b3b2a5f09a48e5..7f92cacf04887d49bfa45e9c412681e2fcde1e30 100644 (file)
--- 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>,
index 8f78f1f4ce3ee9877cd580bb98605f6bab599708..cf379d426a63114ea3437d12ef1e794b1128049d 100644 (file)
@@ -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,