From f5c08d3b82b69c16d2f549bbd201b844ccd25020 Mon Sep 17 00:00:00 2001
From: Jeff Trawick <trawick@apache.org>
Date: Tue, 17 Dec 2013 20:25:54 +0000
Subject: [PATCH] FreeBSD: Disable IPv4-mapped listening sockets by default for
 versions 5+ instead of just for FreeBSD 5.

PR: 53824


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551685 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES      | 3 +++
 configure.in | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c6429ac14d..e45c5e4108 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
+     5+ instead of just for FreeBSD 5. PR 53824. [Jeff Trawick]
+
   *) mod_auth_form: Add a debug message when the fields on a form are not
      recognised. [Graham Leggett]
 
diff --git a/configure.in b/configure.in
index df73d03064..5f469a31e5 100644
--- a/configure.in
+++ b/configure.in
@@ -844,7 +844,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
         ;;
     *)
-- 
2.40.0