Add cgi and cgid back into the configuration system.

Submitted by:	Paul J. Reder <rederpj@raleigh.ibm.com>

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

diff --git a/modules/generators/config.m4 b/modules/generators/config.m4
index b33fb31e1041fe74304c42abd404700c21120b0f..7efa323929981a88c5ccacde02f41238e6994e5a 100644 (file)
--- a/modules/generators/config.m4
+++ b/modules/generators/config.m4
@@ -17,6 +17,18 @@ APACHE_CHECK_GENERATOR_MODULE(suexec, set uid and gid for spawned processes, , n
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 
+if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then
+# if we are using a threaded MPM, we will get better performance with
+# mod_cgid, so make it the default.
+    APACHE_CHECK_GENERATOR_MODULE(cgid, CGI scripts, , yes)
+    APACHE_CHECK_GENERATOR_MODULE(cgi, CGI scripts, , no)
+else
+# if we are using a non-threaded MPM, it makes little sense to use
+# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the         # default
+    APACHE_CHECK_GENERATOR_MODULE(cgi, CGI scripts, , yes)
+    APACHE_CHECK_GENERATOR_MODULE(cgid, CGI scripts, , no)
+fi
+
 APACHE_MODPATH_FINISH
     
 APACHE_SUBST(STANDARD_LIBS)