Commit f3067d11 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent cd054707

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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 ]

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -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

        ;;

server/mpm/winnt/mpm_winnt.c

+9 −0
Original line number Diff line number Diff line
@@ -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.