Commit c30a5171 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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

STATUS

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

configure.in

+4 −1
Original line number Diff line number Diff line
@@ -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*)