[patch] Migration to 2.4

apache2.4.1-r2.diff (text/plain), 4.28 KB, created by Martin Cyr on 2012-04-03 18:33:53 UTC

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 36ce6c1..a6fd581 100644
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -72,16 +72,14 @@ LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
 <IfDefine CACHE>
 LoadModule cache_module modules/mod_cache.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 </IfDefine>
 LoadModule cgi_module modules/mod_cgi.so
 LoadModule cgid_module modules/mod_cgid.so
 <IfDefine DAV>
 LoadModule dav_module modules/mod_dav.so
-</IfDefine>
-<IfDefine DAV>
 LoadModule dav_fs_module modules/mod_dav_fs.so
-</IfDefine>
-<IfDefine DAV>
 LoadModule dav_lock_module modules/mod_dav_lock.so
 </IfDefine>
 LoadModule deflate_module modules/mod_deflate.so
@@ -89,9 +87,6 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule env_module modules/mod_env.so
 LoadModule expires_module modules/mod_expires.so
 LoadModule ext_filter_module modules/mod_ext_filter.so
-<IfDefine CACHE>
-LoadModule file_cache_module modules/mod_file_cache.so
-</IfDefine>
 LoadModule filter_module modules/mod_filter.so
 LoadModule headers_module modules/mod_headers.so
 LoadModule include_module modules/mod_include.so
@@ -118,6 +113,8 @@ LoadModule userdir_module modules/mod_userdir.so
 </IfDefine>
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
 
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.
diff --git a/apache2/modules.d/00_default_settings.conf b/apache2/modules.d/00_default_settings.conf
index 0fa43b2..ee69f2c 100644
--- a/apache2/modules.d/00_default_settings.conf
+++ b/apache2/modules.d/00_default_settings.conf
@@ -131,4 +131,5 @@ LogLevel warn
 	Deny from all
 </FilesMatch>
 
+Mutex default:/var/run
 # vim: ts=4 filetype=apache
diff --git a/apache2/modules.d/00_mod_mime.conf b/apache2/modules.d/00_mod_mime.conf
index 51f23d5..1d9fba2 100644
--- a/apache2/modules.d/00_mod_mime.conf
+++ b/apache2/modules.d/00_mod_mime.conf
@@ -5,7 +5,6 @@
 # or images, you may want to use "application/octet-stream" instead to
 # keep browsers from trying to display binary files as though they are
 # text.
-DefaultType text/plain
 
 <IfModule mime_module>
 # TypesConfig points to the file containing the list of mappings from
diff --git a/apache2/modules.d/40_mod_ssl.conf b/apache2/modules.d/40_mod_ssl.conf
index 3d0a043..53dbf33 100644
--- a/apache2/modules.d/40_mod_ssl.conf
+++ b/apache2/modules.d/40_mod_ssl.conf
@@ -47,17 +47,14 @@ SSLRandomSeed connect builtin
 # stdout.
 SSLPassPhraseDialog  builtin
 
+<IfDefine CACHE>
 ## Inter-Process Session Cache:
 # Configure the SSL Session Cache: First the mechanism  to use and second the
 # expiring timeout (in seconds).
 #SSLSessionCache		dbm:/var/run/ssl_scache
 SSLSessionCache			shmcb:/var/run/ssl_scache(512000)
 SSLSessionCacheTimeout  300
-
-## Semaphore:
-# Configure the path to the mutual exclusion semaphore the SSL engine uses
-# internally for inter-process synchronization.
-SSLMutex  file:/var/run/ssl_mutex
+</IfDefine>
 </IfDefine>
 
 # vim: ts=4 filetype=apache
diff --git a/apache2/vhosts.d/00_default_vhost.conf b/apache2/vhosts.d/00_default_vhost.conf
index 9fa425a..370350c 100644
--- a/apache2/vhosts.d/00_default_vhost.conf
+++ b/apache2/vhosts.d/00_default_vhost.conf
@@ -25,9 +25,6 @@
 #Listen 12.34.56.78:80
 Listen 80
 
-# Use name-based virtual hosting.
-NameVirtualHost *:80
-
 # When virtual hosts are enabled, the main host defined in the default
 # httpd.conf configuration will go away. We redefine it here so that it is
 # still available.
diff --git a/conf.d/apache2 b/conf.d/apache2
index b7ecb4f..37337df 100644
--- a/conf.d/apache2
+++ b/conf.d/apache2
@@ -33,7 +33,7 @@
 #  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
 #                     when you enable SSL)
 #
-APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE"
+APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE -D CACHE"
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff