svn commit: r1092377 - in /httpd/httpd/branches/2.2.x: STATUS configure.in server/mpm/winnt/mpm_winnt.c

[tr...@apache.org]

Author: trawick
Date: Thu Apr 14 16:11:11 2011
New Revision: 1092377

URL: http://svn.apache.org/viewvc?rev=1092377&view=rev
Log:
grab trunk r1091467:

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

Submitted by: trawick
Reviewed by: wrowe, fuangk

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/configure.in
    httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1092377&r1=1092376&r2=1092377&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr 14 16:11:11 2011
@@ -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 ]
 

Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=1092377&r1=1092376&r2=1092377&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Thu Apr 14 16:11:11 2011
@@ -467,6 +467,11 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRI
     *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
         ;;

Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c?rev=1092377&r1=1092376&r2=1092377&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c Thu Apr 14 16:11:11 2011
@@ -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.