Merge r1652929, r1652931 from trunk:

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

Submitted by: ylavic
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index ace79a7341d2280432b9a926c8b5b669c14ccc97..dff64409987e5af5127383a0dfc615ea1ce2a622 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Changes with Apache 2.4.12
   *) mpm_winnt: Normalize the error and status messages emitted by service.c,
      the service control interface for Windows.  [William Rowe]
 
+  *) configure: Fix --enable-v4-mapped configuration on *BSD. PR 53824.
+     [ olli hauer <ohauer gmx.de>, Yann Ylavic ]
+
 Changes with Apache 2.4.11
   
   *) SECURITY: CVE-2014-3583 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index 09c96489703a01d03c6e62e199e686a5e4806dfd..1056bf73dd6ff2cd6c0751ec6e7437f0123760ec 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * configure: Fix --enable-v4-mapped configuration on *BSD. PR 53824.
-     trunk patch: http://svn.apache.org/r1652929
-                  http://svn.apache.org/r1652931 (CHANGES)
-     2.4.x patch: trunks works (modulo CHANGES)
-     +1: ylavic, rjung, wrowe
-
    * configure: Fix detection of old Solaris platforms.
      Autotools need double square brackets.
      Inspired by checking PR 53824 patch above for consistency.

diff --git a/configure.in b/configure.in
index 864d7c7c0e80dd71a67d2727ed29bd3914bde52d..d2767aebe25d757f56be96f2b565839234bd320f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -774,7 +774,7 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
 ],
 [
     case $host in
-    *freebsd[1234].*)
+    *freebsd[[1234]].*)
         v4mapped=yes
         ;;
     *freebsd*|*netbsd*|*openbsd*)