diff options
| author | Joe Orton <jorton@apache.org> | 2021-02-25 10:11:57 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2021-02-25 10:11:57 +0100 |
| commit | ce017390110ce49ca9eccba8b2eabfc2870b7932 (patch) | |
| tree | f0c689850af061a4ffad8a945a903ac225b551c9 /modules/proxy | |
| parent | *) core: Adding SSL related inquiry functions to the server API. (diff) | |
| download | apache2-ce017390110ce49ca9eccba8b2eabfc2870b7932.tar.xz apache2-ce017390110ce49ca9eccba8b2eabfc2870b7932.zip | |
Enable mod_cgid stderr handling via Unix socket fd transfer by
default, rather than as an opt-in configure flag. (This has been
tested in Fedora for >12 months without seeing any new problems)
* configure.in: Check for CMSG_DATA here, and define HAVE_FDPASSING
and $ap_has_fdpassing if fd passing is supported.
* modules/generator/config5.m4,
modules/generator/mod_cgid.c: Drop configure flag for mod_cgid
fdpassing support, instead enable where possible by default.
* modules/proxy/config.m4: Rely on configure test for CMSG_DATA.
* .travis.yml: Switch test for cgid fdpassing for testing w/o
CMSG_DATA.
Github: closes #172
PR: 54221
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1886912 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/config.m4 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4 index d9bfd7a1ce..34346a6698 100644 --- a/modules/proxy/config.m4 +++ b/modules/proxy/config.m4 @@ -40,12 +40,7 @@ APACHE_MODULE(proxy_fcgi, Apache proxy FastCGI module. Requires --enable-proxy. APACHE_MODULE(proxy_scgi, Apache proxy SCGI module. Requires --enable-proxy., $proxy_scgi_objs, , most, , proxy) APACHE_MODULE(proxy_uwsgi, Apache proxy UWSGI module. Requires --enable-proxy., $proxy_uwsgi_objs, , most, , proxy) 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> - ]) - if test $ac_cv_have_decl_CMSG_DATA = "no"; then - AC_MSG_WARN([Your system does not support CMSG_DATA.]) + if test $ap_has_fdpassing = 0; then enable_proxy_fdpass=no fi ],proxy) |