Commit c583598f authored by Jeff Trawick's avatar Jeff Trawick
Browse files

rework choice of cgi implementation, handling MinGW 

PR: 49535 (subset of reported issues, replacement for supplied patch)


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

modules/generators/config5.m4

+20 −5
Changes for modules/generators/config5.m4: 20 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -11,9 +11,27 @@ APACHE_MODULE(info, server information, , , most) 
APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [

              other_targets=suexec ] )



# Is mod_cgid needed?

case $host in

    *mingw*)

        dnl No fork+thread+fd issues, and cgid doesn't work anyway.

        cgid_needed="no"

        ;;

    *)

        if ap_mpm_is_threaded; then

# if we are using a threaded MPM, we will get better performance with

# mod_cgid, so make it the default.

            dnl if we are using a threaded MPM on Unix, we can get better

            dnl performance with mod_cgid, and also avoid potential issues

            dnl with forking from a threaded process.

            cgid_needed="yes"

        else

            dnl if we are using a non-threaded MPM, it makes little sense to

            dnl use mod_cgid, and it just opens up holes we don't need.

            cgid_needed="no"

        fi

        ;;

esac



if test $cgid_needed = "yes"; then

    APACHE_MODULE(cgid, CGI scripts.  Enabled by default with threaded MPMs, , , yes, [

    case $host in

      *-solaris2*)
@@ -54,9 +72,6 @@ For more info: <http://issues.apache.org/bugzilla/show_bug.cgi?id=34264>]) 
  ])

    APACHE_MODULE(cgi, CGI scripts.  Enabled by default with non-threaded MPMs, , , 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_MODULE(cgi, CGI scripts.  Enabled by default with non-threaded MPMs, , , yes)

    APACHE_MODULE(cgid, CGI scripts.  Enabled by default with threaded MPMs, , , no)

fi