From: Jim Jagielski <jim@apache.org>
Date: Thu, 20 Feb 2014 19:36:12 +0000 (+0000)
Subject: Merge r1551685 from trunk:
X-Git-Tag: 2.4.8~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ca336b7c454da519a460c439fc1681ff8cf1dd0;p=apache

Merge r1551685 from trunk:

FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570322 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 0becd5e696..b0109dcc2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.8
 
+  *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
+     5+ instead of just for FreeBSD 5. PR 53824. [Jeff Trawick]
+
   *) mod_proxy_wstunnel: Avoid busy loop on client errors, drop message
      IDs 02445, 02446, and 02448 to TRACE1 from DEBUG. PR 56145.
      [Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
diff --git a/configure.in b/configure.in
index 8120156841..864d7c7c0e 100644
--- a/configure.in
+++ b/configure.in
@@ -774,7 +774,10 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
 ],
 [
     case $host in
-    *freebsd5*|*netbsd*|*openbsd*)
+    *freebsd[1234].*)
+        v4mapped=yes
+        ;;
+    *freebsd*|*netbsd*|*openbsd*)
         v4mapped=no
         ;;
     *)