--- docs/conf/httpd.conf.in.orig 2007-12-21 03:43:00.000000000 -0800 +++ docs/conf/httpd.conf.in 2009-09-22 17:16:52.000000000 -0700 @@ -63,8 +63,8 @@ # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. # -User daemon -Group daemon +User _www +Group _www @@ -142,7 +142,7 @@ # http://httpd.apache.org/docs/2.2/mod/core.html#options # for more information. # - Options Indexes FollowSymLinks + Options Indexes FollowSymLinks MultiViews # # AllowOverride controls what directives may be placed in .htaccess files. @@ -360,6 +360,9 @@ #EnableMMAP off #EnableSendfile off +# 6894961 +TraceEnable off + # Supplemental configuration # # The configuration files in the @rel_sysconfdir@/extra/ directory can be @@ -368,19 +371,19 @@ # necessary. # Server-pool management (MPM specific) -#Include @rel_sysconfdir@/extra/httpd-mpm.conf +Include @rel_sysconfdir@/extra/httpd-mpm.conf # Multi-language error messages #Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf # Fancy directory listings -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf +Include @rel_sysconfdir@/extra/httpd-autoindex.conf # Language settings -#Include @rel_sysconfdir@/extra/httpd-languages.conf +Include @rel_sysconfdir@/extra/httpd-languages.conf # User home directories -#Include @rel_sysconfdir@/extra/httpd-userdir.conf +Include @rel_sysconfdir@/extra/httpd-userdir.conf # Real-time info on requests and configuration #Include @rel_sysconfdir@/extra/httpd-info.conf @@ -389,7 +392,7 @@ #Include @rel_sysconfdir@/extra/httpd-vhosts.conf # Local access to the Apache HTTP Server Manual -#Include @rel_sysconfdir@/extra/httpd-manual.conf +Include @rel_sysconfdir@/extra/httpd-manual.conf # Distributed authoring and versioning (WebDAV) #Include @rel_sysconfdir@/extra/httpd-dav.conf @@ -408,3 +411,5 @@ SSLRandomSeed startup builtin SSLRandomSeed connect builtin + +Include @rel_sysconfdir@/other/*.conf