From: Jim Jagielski <jim@apache.org>
Date: Wed, 3 Aug 2016 11:50:07 +0000 (+0000)
Subject: Merge r1753224 from trunk:
X-Git-Tag: 2.4.24~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e1c4bba2089173415c045b2ce12d7f6e6d3cf9;p=thirdparty%2Fapache%2Fhttpd.git

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

diff --git a/STATUS b/STATUS
index 89dab2c2f10..1100a340e11 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index ebb13f00123..a0915c653f8 100644
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -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>