[Rt-commit] rt branch, 5.0/add-test-config-for-apache2.4-fcgid, created. rt-5.0.0-2-g4be49fbdb9

[Dianne Skoll]

The branch, 5.0/add-test-config-for-apache2.4-fcgid has been created
        at  4be49fbdb963a2a53cbcf3bb0a589341eb111b77 (commit)

- Log -----------------------------------------------------------------
commit 4be49fbdb963a2a53cbcf3bb0a589341eb111b77
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Aug 5 08:38:46 2020 -0400

    Add configuration file for testing under Apache 2.4 and mod_fcgid.

diff --git a/configure.ac b/configure.ac
index 70a9c05a24..c2a32c9f91 100755
--- a/configure.ac
+++ b/configure.ac
@@ -49,14 +49,14 @@ dnl WEB_HANDLER
 AC_ARG_WITH(web-handler,
     AC_HELP_STRING([--with-web-handler=LIST],
 	[comma separated list of web-handlers RT will be able to use.
-         Default is fastcgi. Valid values are modperl1, modperl2, fastcgi and standalone.
+         Default is fastcgi. Valid values are modperl1, modperl2, fastcgi, fcgid and standalone.
          To successfully run RT you need only one.
         ]),
     WEB_HANDLER=$withval,
     WEB_HANDLER=fastcgi)
-my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV@<:@0@:>@' $WEB_HANDLER)
+my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi|fcgid|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV@<:@0@:>@' $WEB_HANDLER)
 if test "$my_web_handler_test" != "ok"; then
-	AC_MSG_ERROR([Only modperl1, modperl2, fastcgi and standalone are valid web-handlers])
+	AC_MSG_ERROR([Only modperl1, modperl2, fastcgi, fcgid and standalone are valid web-handlers])
 fi
 AC_SUBST(WEB_HANDLER)
 
@@ -506,6 +506,7 @@ AC_CONFIG_FILES([
                  t/data/configs/apache2.2+mod_perl.conf
                  t/data/configs/apache2.2+fastcgi.conf
                  t/data/configs/apache2.4+mod_perl.conf
-                 t/data/configs/apache2.4+fastcgi.conf],
+                 t/data/configs/apache2.4+fastcgi.conf
+                 t/data/configs/apache2.4+fcgid.conf]
                )
 AC_OUTPUT
diff --git a/lib/RT/Test/Apache.pm b/lib/RT/Test/Apache.pm
index 367cf4fdc3..5d905d62ca 100644
--- a/lib/RT/Test/Apache.pm
+++ b/lib/RT/Test/Apache.pm
@@ -54,10 +54,12 @@ my %MODULES = (
     '2.2' => {
         "mod_perl" => [qw(authz_host env alias perl)],
         "fastcgi"  => [qw(authz_host env alias mime fastcgi)],
+
     },
     '2.4' => {
         "mod_perl" => [qw(mpm_worker authz_core authn_core authz_host env alias perl)],
         "fastcgi"  => [qw(mpm_worker authz_core authn_core authz_host env alias mime fastcgi)],
+        "fcgid"  => [qw(mpm_worker authz_core authn_core authz_host env alias mime fcgid)],
     },
 );
 
diff --git a/t/data/configs/apache2.4+fcgid.conf.in b/t/data/configs/apache2.4+fcgid.conf.in
new file mode 100644
index 0000000000..d0e0f82cb5
--- /dev/null
+++ b/t/data/configs/apache2.4+fcgid.conf.in
@@ -0,0 +1,46 @@
+ServerRoot %%SERVER_ROOT%%
+PidFile %%PID_FILE%%
+ServerAdmin root at localhost
+
+%%LOAD_MODULES%%
+
+<IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
+User @WEB_USER@
+Group @WEB_GROUP@
+</IfModule>
+</IfModule>
+
+ServerName localhost
+Listen %%LISTEN%%
+
+ErrorLog "%%LOG_FILE%%"
+LogLevel debug
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+AddDefaultCharset UTF-8
+
+FcgidConnectTimeout 20
+FcgidProcessTableFile %%tmp_dir%%/shm
+FcgidIPCDir %%tmp_dir%%
+FcgidInitialEnv RT_TESTING 1
+
+ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/
+
+DocumentRoot "%%DOCUMENT_ROOT%%"
+<Location />
+
+    <RequireAll>
+        Require all granted
+%%BASIC_AUTH%%
+    </RequireAll>
+
+    Options +ExecCGI
+    AddHandler fcgid-script .fcgi
+</Location>
+

-----------------------------------------------------------------------