auto-import httpd-2.0.40-21 from httpd-2.0.40-21.src.rpmhttpd-2_0_40-21RHL-8-split

1 files changed, 10 insertions, 3 deletions

diff --git a/httpd.conf b/httpd.conf
index debba41..507e2cc 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -194,7 +194,6 @@ LoadModule status_module modules/mod_status.so
 LoadModule autoindex_module modules/mod_autoindex.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule info_module modules/mod_info.so
-LoadModule cgi_module modules/mod_cgi.so
 LoadModule dav_fs_module modules/mod_dav_fs.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
 LoadModule negotiation_module modules/mod_negotiation.so
@@ -210,6 +209,14 @@ LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 LoadModule proxy_connect_module modules/mod_proxy_connect.so
 
+<IfModule prefork.c>
+LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+
+<IfModule worker.c>
+LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+
 #
 # ExtendedStatus controls whether Apache will generate "full" status
 # information (ExtendedStatus On) or just basic information (ExtendedStatus
@@ -339,7 +346,7 @@ DocumentRoot "/var/www/html"
 # Disable autoindex for the root directory, and present a
 # default Welcome page if no other index page is present.
 #
-<LocationMatch "^/+$">
+<LocationMatch "^/$>
     Options -Indexes
     ErrorDocument 403 /error/noindex.html
 </LocationMatch>
@@ -565,7 +572,7 @@ ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
 # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
 # for setting UNIX socket for communicating with cgid.
 #
-#Scriptsock            logs/cgisock
+Scriptsock            run/httpd.cgid
 </IfModule>
 
 #