Blah

apache2/httpd.conf

@@ -1,4 +1,4 @@
-# This is a modification of the default Apache 2.2 configuration file
+# This is a modification of the default Apache 2.4 configuration file
 # for Gentoo Linux.
 #
 # Support:
@@ -13,9 +13,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.4> for detailed information.
 # In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -36,6 +36,7 @@
 # ServerRoot at a non-local disk, be sure to point the LockFile directive
 # at a local disk.  If you wish to share the same ServerRoot for multiple
 # httpd daemons, you will need to change at least LockFile and PidFile.
+# Comment: The LockFile directive has been replaced by the Mutex directive
 ServerRoot "/usr/lib64/apache2"
 
 # Dynamic Shared Object (DSO) Support
@@ -61,13 +62,12 @@ ServerRoot "/usr/lib64/apache2"
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule authn_alias_module modules/mod_authn_alias.so
 LoadModule authn_anon_module modules/mod_authn_anon.so
+LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
 LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_owner_module modules/mod_authz_owner.so
@@ -89,9 +89,6 @@ LoadModule dav_lock_module modules/mod_dav_lock.so
 </IfDefine>
 LoadModule deflate_module modules/mod_deflate.so
 LoadModule dir_module modules/mod_dir.so
-<IfDefine CACHE>
-LoadModule disk_cache_module modules/mod_disk_cache.so
-</IfDefine>
 LoadModule env_module modules/mod_env.so
 LoadModule expires_module modules/mod_expires.so
 LoadModule ext_filter_module modules/mod_ext_filter.so
@@ -106,14 +103,14 @@ LoadModule info_module modules/mod_info.so
 </IfDefine>
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule logio_module modules/mod_logio.so
-<IfDefine CACHE>
-LoadModule mem_cache_module modules/mod_mem_cache.so
-</IfDefine>
 LoadModule mime_module modules/mod_mime.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
+<IfDefine SSL>
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+</IfDefine>
 LoadModule speling_module modules/mod_speling.so
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so
@@ -122,6 +119,7 @@ LoadModule ssl_module modules/mod_ssl.so
 LoadModule status_module modules/mod_status.so
 </IfDefine>
 LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule unixd_module modules/mod_unixd.so
 <IfDefine USERDIR>
 LoadModule userdir_module modules/mod_userdir.so
 </IfDefine>
@@ -137,7 +135,6 @@ LoadModule vhost_alias_module modules/mod_vhost_alias.so
 User apache
 Group apache
 
-ServerName localhost
 # Supplemental configuration
 #
 # Most of the configuration files in the /etc/apache2/modules.d/ directory can
@@ -149,9 +146,6 @@ ServerName localhost
 # flag to use.
 Include /etc/apache2/modules.d/*.conf
 
-Include /etc/apache2/custom/*.conf
-
-
 # Virtual-host support
 #
 # Gentoo has made using virtual-hosts easy. In /etc/apache2/vhosts.d/ we
@@ -159,5 +153,4 @@ Include /etc/apache2/custom/*.conf
 # APACHE2_OPTS in /etc/conf.d/apache2).
 Include /etc/apache2/vhosts.d/*.conf
 
-
 # vim: ts=4 filetype=apache