Fix build broken w/o --enable-cgid-fdpassing by r1867968:

* modules/generators/cgi_common.h: Only define CGI bucket type
  if WANT_CGI_BUCKET is defined.

* modules/generators/mod_cgi.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff APR_FILES_AS_SOCKETS is defined

* modules/generators/mod_cgid.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff HAVE_CGID_FDPASSING (--enable-cgid-fdpassing).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1867971 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/generators/cgi_common.h b/modules/generators/cgi_common.h
index 0ff66f94e3a0cb9e4ccec08767b43b4ba11c61f7..85c96855ead39100ab5f01f205114e1d5e918e74 100644 (file)
--- a/modules/generators/cgi_common.h
+++ b/modules/generators/cgi_common.h
@@ -44,6 +44,7 @@ static void discard_script_output(apr_bucket_brigade *bb)
     }
 }
 
+#ifdef WANT_CGI_BUCKET
 /* A CGI bucket type is needed to catch any output to stderr from the
  * script; see PR 22030. */
 static const apr_bucket_type_t bucket_type_cgi;
@@ -235,6 +236,8 @@ static const apr_bucket_type_t bucket_type_cgi = {
     apr_bucket_copy_notimpl
 };
 
+#endif /* WANT_CGI_BUCKET */
+
 /* Handle the CGI response output, having set up the brigade with the
  * CGI or PIPE bucket as appropriate. */
 static int cgi_handle_response(request_rec *r, int nph, apr_bucket_brigade *bb,

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 5708aa0be64e2dc77264e364c04d836aa4a2d940..8b96fd5190aeb7ab397bb8ee0cf97cd0df6b4784 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -569,8 +569,9 @@ static apr_status_t default_build_command(const char **cmd, const char ***argv,
 }
 
 #if APR_FILES_AS_SOCKETS
-#include "cgi_common.h"
+#define WANT_CGI_BUCKET
 #endif
+#include "cgi_common.h"
 
 static int cgi_handler(request_rec *r)
 {

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 90cd5297353a3852824c25c750291c66e864eefe..102d2b3193c74066c5451698faf185c1a79e445d 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1349,11 +1349,12 @@ static int log_script(request_rec *r, cgid_server_conf * conf, int ret,
     return ret;
 }
 
-#ifdef HAVE_CGID_FDPASSING
 /* Pull in CGI bucket implementation. */
 #define cgi_server_conf cgid_server_conf
-#include "cgi_common.h"
+#ifdef HAVE_CGID_FDPASSING
+#define WANT_CGI_BUCKET
 #endif
+#include "cgi_common.h"
 
 static int connect_to_daemon(int *sdptr, request_rec *r,
                              cgid_server_conf *conf)