1--- docs/conf/httpd.conf.in.orig 2007-12-21 03:43:00.000000000 -0800 2+++ docs/conf/httpd.conf.in 2009-09-22 17:16:52.000000000 -0700 3@@ -52,6 +52,9 @@ 4 # LoadModule foo_module modules/mod_foo.so 5 # 6 @@LoadModule@@ 7+#LoadModule perl_module libexec/apache2/mod_perl.so 8+#LoadModule php5_module libexec/apache2/libphp5.so 9+LoadModule hfs_apple_module libexec/apache2/mod_hfs_apple.so 10 11 <IfModule !mpm_netware_module> 12 <IfModule !mpm_winnt_module> 13@@ -63,8 +63,8 @@ 14 # It is usually good practice to create a dedicated user and group for 15 # running httpd, as with most system services. 16 # 17-User daemon 18-Group daemon 19+User _www 20+Group _www 21 22 </IfModule> 23 </IfModule> 24@@ -142,7 +142,7 @@ 25 # http://httpd.apache.org/docs/2.2/mod/core.html#options 26 # for more information. 27 # 28- Options Indexes FollowSymLinks 29+ Options Indexes FollowSymLinks MultiViews 30 31 # 32 # AllowOverride controls what directives may be placed in .htaccess files. 33@@ -360,6 +360,9 @@ 34 #EnableMMAP off 35 #EnableSendfile off 36 37+# 6894961 38+TraceEnable off 39+ 40 # Supplemental configuration 41 # 42 # The configuration files in the @rel_sysconfdir@/extra/ directory can be 43@@ -368,19 +371,19 @@ 44 # necessary. 45 46 # Server-pool management (MPM specific) 47-#Include @rel_sysconfdir@/extra/httpd-mpm.conf 48+Include @rel_sysconfdir@/extra/httpd-mpm.conf 49 50 # Multi-language error messages 51 #Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf 52 53 # Fancy directory listings 54-#Include @rel_sysconfdir@/extra/httpd-autoindex.conf 55+Include @rel_sysconfdir@/extra/httpd-autoindex.conf 56 57 # Language settings 58-#Include @rel_sysconfdir@/extra/httpd-languages.conf 59+Include @rel_sysconfdir@/extra/httpd-languages.conf 60 61 # User home directories 62-#Include @rel_sysconfdir@/extra/httpd-userdir.conf 63+Include @rel_sysconfdir@/extra/httpd-userdir.conf 64 65 # Real-time info on requests and configuration 66 #Include @rel_sysconfdir@/extra/httpd-info.conf 67@@ -389,7 +392,7 @@ 68 #Include @rel_sysconfdir@/extra/httpd-vhosts.conf 69 70 # Local access to the Apache HTTP Server Manual 71-#Include @rel_sysconfdir@/extra/httpd-manual.conf 72+Include @rel_sysconfdir@/extra/httpd-manual.conf 73 74 # Distributed authoring and versioning (WebDAV) 75 #Include @rel_sysconfdir@/extra/httpd-dav.conf 76@@ -408,3 +411,5 @@ 77 SSLRandomSeed startup builtin 78 SSLRandomSeed connect builtin 79 </IfModule> 80+ 81+Include @rel_sysconfdir@/other/*.conf 82