You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2021/02/25 09:11:57 UTC
svn commit: r1886912 - in /httpd/httpd/trunk: .travis.yml CHANGES
configure.in modules/generators/config5.m4 modules/generators/mod_cgid.c
modules/proxy/config.m4
Author: jorton
Date: Thu Feb 25 09:11:57 2021
New Revision: 1886912
URL: http://svn.apache.org/viewvc?rev=1886912&view=rev
Log:
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
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/configure.in
httpd/httpd/trunk/modules/generators/config5.m4
httpd/httpd/trunk/modules/generators/mod_cgid.c
httpd/httpd/trunk/modules/proxy/config.m4
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Thu Feb 25 09:11:57 2021
@@ -117,9 +117,8 @@ jobs:
- name: Linux Ubuntu, Event MPM, all-modules, mod_cgid only
env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi"
# -------------------------------------------------------------------------
- - if: *condition_not_24x
- name: Linux Ubuntu, Event MPM, all-modules, mod_cgid fdpassing
- env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi --enable-cgid-fdpassing"
+ - name: Linux Ubuntu, Event MPM, all-modules, no CMSG_DATA
+ env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event ac_cv_have_decl_CMSG_DATA=no"
# -------------------------------------------------------------------------
- if: *condition_not_24x
name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Feb 25 09:11:57 2021
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.1
+ *) mod_cgid: Intercept and log stderr output correctly on Unix systems
+ supporting fd passing. PR 54221. [Joe Orton]
+
*) mod_auth_digest: Fast validation of the nonce's base64 to fail early if
the format can't match anyway. [Yann Ylavic]
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Thu Feb 25 09:11:57 2021
@@ -567,6 +567,16 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes
AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
fi
+AC_CHECK_DECL(CMSG_DATA,,, [#include <sys/types.h>
+#include <sys/socket.h>])
+if test $ac_cv_have_decl_CMSG_DATA = "yes"; then
+ AC_DEFINE([HAVE_FDPASSING], 1, [Define if file descriptor passing is supported])
+ ap_has_fdpassing=1
+else
+ ap_has_fdpassing=0
+ AC_MSG_WARN([This system does not support file descriptor passing.])
+fi
+
APACHE_CHECK_SYSTEMD
dnl ## Set up any appropriate OS-specific environment variables for apachectl
Modified: httpd/httpd/trunk/modules/generators/config5.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/config5.m4?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/config5.m4 (original)
+++ httpd/httpd/trunk/modules/generators/config5.m4 Thu Feb 25 09:11:57 2021
@@ -78,15 +78,4 @@ fi
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
-AC_ARG_ENABLE(cgid-fdpassing,
- [APACHE_HELP_STRING(--enable-cgid-fdpassing,Enable experimental mod_cgid support for fd passing)],
- [if test "$enableval" = "yes"; then
- AC_CHECK_DECL(CMSG_DATA,
- [AC_DEFINE([HAVE_CGID_FDPASSING], 1, [Enable FD passing support in mod_cgid])],
- [AC_MSG_ERROR([cannot support mod_cgid fd-passing on this system])], [
-#include <sys/types.h>
-#include <sys/socket.h>])
- fi
-])
-
APACHE_MODPATH_FINISH
Modified: httpd/httpd/trunk/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgid.c?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgid.c Thu Feb 25 09:11:57 2021
@@ -218,7 +218,7 @@ typedef struct {
#define cgi_server_conf cgid_server_conf
#define cgi_module cgid_module
-#ifdef HAVE_CGID_FDPASSING
+#ifdef HAVE_FDPASSING
/* Pull in CGI bucket implementation. */
#define WANT_CGI_BUCKET
#endif
@@ -353,7 +353,7 @@ static apr_status_t close_unix_socket(vo
static apr_status_t sock_readhdr(int fd, int *errfd, void *vbuf, size_t buf_size)
{
int rc;
-#ifndef HAVE_CGID_FDPASSING
+#ifndef HAVE_FDPASSING
char *buf = vbuf;
size_t bytes_read = 0;
@@ -458,7 +458,7 @@ static apr_status_t sock_writev(int fd,
}
va_end(ap);
-#ifndef HAVE_CGID_FDPASSING
+#ifndef HAVE_FDPASSING
do {
rc = writev(fd, vec, count);
} while (rc < 0 && errno == EINTR);
@@ -1541,7 +1541,7 @@ static int cgid_handler(request_rec *r)
}
*/
-#ifdef HAVE_CGID_FDPASSING
+#ifdef HAVE_FDPASSING
rv = apr_file_pipe_create(&script_err, &errpipe_out, r->pool);
if (rv) {
return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, rv, APLOGNO(10176),
@@ -1623,7 +1623,7 @@ static int cgid_handler(request_rec *r)
shutdown(sd, 1);
bb = apr_brigade_create(r->pool, c->bucket_alloc);
-#ifdef HAVE_CGID_FDPASSING
+#ifdef HAVE_FDPASSING
b = cgi_bucket_create(r, dc->timeout, tempsock, script_err, c->bucket_alloc);
if (b == NULL)
return HTTP_INTERNAL_SERVER_ERROR; /* should call log_scripterror() w/ _UNAVAILABLE? */
Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=1886912&r1=1886911&r2=1886912&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Thu Feb 25 09:11:57 2021
@@ -40,12 +40,7 @@ APACHE_MODULE(proxy_fcgi, Apache proxy F
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)