Commit 00930c7d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1753224 from trunk: 

Unclear whether fdpass is common enough to justify a 'most' configuration,
but for the time being, assign it -something- for a build priority.


Submitted by: wrowe
Reviewed/backported by: jim


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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy_fdpass: enable at build level 'most', restores compatibility

     with common httpd 2.4 rpm.spec descriptors.

     trunk patch: http://svn.apache.org/r1753224

     2.4.x patch: trunk works

     +1: wrowe, covener, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/proxy/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ APACHE_MODULE(proxy_ftp, Apache proxy FTP module. Requires --enable-proxy., $pr 
APACHE_MODULE(proxy_http, Apache proxy HTTP module.  Requires --enable-proxy., $proxy_http_objs, , most, , proxy)

APACHE_MODULE(proxy_fcgi, Apache proxy FastCGI module.  Requires --enable-proxy., $proxy_fcgi_objs, , most, , proxy)

APACHE_MODULE(proxy_scgi, Apache proxy SCGI module.  Requires --enable-proxy., $proxy_scgi_objs, , most, , proxy)

APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module.  Requires --enable-proxy., $proxy_fdpass_objs, , , [

APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module.  Requires --enable-proxy., $proxy_fdpass_objs, , most, [

  AC_CHECK_DECL(CMSG_DATA,,, [

    #include <sys/types.h>

    #include <sys/socket.h>