From: Jeff Trawick <trawick@apache.org>
Date: Thu, 14 Apr 2011 16:11:11 +0000 (+0000)
Subject: grab trunk r1091467:
X-Git-Tag: 2.2.18~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5624d9f995dd37375c5dcd7ecba9fc5a0fa1836;p=thirdparty%2Fapache%2Fhttpd.git

grab trunk r1091467:

Avoid need for --disable-v4-mapped on MinGW

Submitted by: trawick
Reviewed by: wrowe, fuangk


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

diff --git a/STATUS b/STATUS
index 34d39bb9049..87256455516 100644
--- a/STATUS
+++ b/STATUS
@@ -108,11 +108,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~trawick/mingw_april_10.txt
      +1: trawick, wrowe, fuankg
 
-  * Avoid need for --disable-v4-mapped on MinGW
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1091467
-     2.2.x patch: http://people.apache.org/~trawick/mingw_v4_mapped.txt
-     +1: trawick, wrowe, fuankg
-
 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 d37b11dc529..d240cfa02f7 100644
--- a/configure.in
+++ b/configure.in
@@ -467,6 +467,11 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
     *freebsd5*|*netbsd*|*openbsd*)
         v4mapped=no
         ;;
+    *mingw*)
+        dnl WinNT is the only MPM on this platform, and it doesn't support
+        dnl this feature.
+        v4mapped=no
+        ;;
     *)
         v4mapped=yes
         ;;
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 52c4ff9ccc3..90f9232e0f9 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -39,6 +39,15 @@
 #include <malloc.h>
 #include "apr_atomic.h"
 
+/* Because ap_setup_listeners() is skipped in the child, any merging
+ * of [::]:80 and 0.0.0.0:80 for AP_ENABLE_V4_MAPPED in the parent
+ * won't have taken place in the child, so the child will expect to
+ * read two sockets for "Listen 80" but the parent will send only
+ * one.
+ */
+#ifdef AP_ENABLE_V4_MAPPED
+#error The WinNT MPM does not currently support AP_ENABLE_V4_MAPPED
+#endif
 
 /* scoreboard.c does the heavy lifting; all we do is create the child
  * score by moving a handle down the pipe into the child's stdin.