From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 25 May 2015 08:43:57 +0000 (+0000)
Subject: Merge r1551685, r1652929 from trunk.
X-Git-Tag: 2.2.30~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb20b2f195b6ef050cecc60eec32589bf41b01fb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1551685, r1652929 from trunk.


r1551685 | trawick | 2013-12-17 21:25:54 +0100 (Tue, 17 Dec 2013) | 5 lines

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

PR: 53824


r1652929 | ylavic | 2015-01-19 09:06:56 +0100 (Mon, 19 Jan 2015) | 4 lines

Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic


Reviewed by: ylavic, trawick, rjung
Backported by: ylavic


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

diff --git a/CHANGES b/CHANGES
index d7dfcbce77d..4f11df88559 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.30
 
+  *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
+     5+ instead of just for FreeBSD 5. PR 53824.  [Jeff Trawick,
+     Olli Hauer <ohauer gmx de>]
+
   *) mod_proxy: use the original (non absolute) form of the request-line's URI
      for requests embedded in CONNECT payloads used to connect SSL backends via
      a ProxyRemote forward-proxy.  PR 55892.  [Hendrik Harms <hendrik.harms
diff --git a/STATUS b/STATUS
index f212aa1dae5..a4432516328 100644
--- a/STATUS
+++ b/STATUS
@@ -101,15 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * FreeBSD: Disable IPv4-mapped listening sockets by default for versions
-    5+ instead of just for FreeBSD 5.
-    trunk patch: http://svn.apache.org/r1551685
-                 http://svn.apache.org/r1652929
-    2.4.x patch: http://svn.apache.org/r1570322
-                 http://svn.apache.org/r1653962
-    2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-freesbd_v4mapped.patch
-    +1: ylavic, trawick, rjung
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/configure.in b/configure.in
index cc6ca13e400..8d28ae8fd22 100644
--- a/configure.in
+++ b/configure.in
@@ -480,7 +480,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
         ;;
     *mingw*)