Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 410607 | Differences between
and this patch

Collapse All | Expand All

(-)a/apache2/httpd.conf (-7 / +4 lines)
Lines 72-87 LoadModule authz_user_module modules/mod_authz_user.so Link Here
72
LoadModule autoindex_module modules/mod_autoindex.so
72
LoadModule autoindex_module modules/mod_autoindex.so
73
<IfDefine CACHE>
73
<IfDefine CACHE>
74
LoadModule cache_module modules/mod_cache.so
74
LoadModule cache_module modules/mod_cache.so
75
LoadModule file_cache_module modules/mod_file_cache.so
76
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
75
</IfDefine>
77
</IfDefine>
76
LoadModule cgi_module modules/mod_cgi.so
78
LoadModule cgi_module modules/mod_cgi.so
77
LoadModule cgid_module modules/mod_cgid.so
79
LoadModule cgid_module modules/mod_cgid.so
78
<IfDefine DAV>
80
<IfDefine DAV>
79
LoadModule dav_module modules/mod_dav.so
81
LoadModule dav_module modules/mod_dav.so
80
</IfDefine>
81
<IfDefine DAV>
82
LoadModule dav_fs_module modules/mod_dav_fs.so
82
LoadModule dav_fs_module modules/mod_dav_fs.so
83
</IfDefine>
84
<IfDefine DAV>
85
LoadModule dav_lock_module modules/mod_dav_lock.so
83
LoadModule dav_lock_module modules/mod_dav_lock.so
86
</IfDefine>
84
</IfDefine>
87
LoadModule deflate_module modules/mod_deflate.so
85
LoadModule deflate_module modules/mod_deflate.so
Lines 89-97 LoadModule dir_module modules/mod_dir.so Link Here
89
LoadModule env_module modules/mod_env.so
87
LoadModule env_module modules/mod_env.so
90
LoadModule expires_module modules/mod_expires.so
88
LoadModule expires_module modules/mod_expires.so
91
LoadModule ext_filter_module modules/mod_ext_filter.so
89
LoadModule ext_filter_module modules/mod_ext_filter.so
92
<IfDefine CACHE>
93
LoadModule file_cache_module modules/mod_file_cache.so
94
</IfDefine>
95
LoadModule filter_module modules/mod_filter.so
90
LoadModule filter_module modules/mod_filter.so
96
LoadModule headers_module modules/mod_headers.so
91
LoadModule headers_module modules/mod_headers.so
97
LoadModule include_module modules/mod_include.so
92
LoadModule include_module modules/mod_include.so
Lines 118-123 LoadModule userdir_module modules/mod_userdir.so Link Here
118
</IfDefine>
113
</IfDefine>
119
LoadModule usertrack_module modules/mod_usertrack.so
114
LoadModule usertrack_module modules/mod_usertrack.so
120
LoadModule vhost_alias_module modules/mod_vhost_alias.so
115
LoadModule vhost_alias_module modules/mod_vhost_alias.so
116
LoadModule unixd_module modules/mod_unixd.so
117
LoadModule access_compat_module modules/mod_access_compat.so
121
118
122
# If you wish httpd to run as a different user or group, you must run
119
# If you wish httpd to run as a different user or group, you must run
123
# httpd as root initially and it will switch.
120
# httpd as root initially and it will switch.
(-)a/apache2/modules.d/00_default_settings.conf (+1 lines)
Lines 131-134 LogLevel warn Link Here
131
	Deny from all
131
	Deny from all
132
</FilesMatch>
132
</FilesMatch>
133
133
134
Mutex default:/var/run
134
# vim: ts=4 filetype=apache
135
# vim: ts=4 filetype=apache
(-)a/apache2/modules.d/00_mod_mime.conf (-1 lines)
Lines 5-11 Link Here
5
# or images, you may want to use "application/octet-stream" instead to
5
# or images, you may want to use "application/octet-stream" instead to
6
# keep browsers from trying to display binary files as though they are
6
# keep browsers from trying to display binary files as though they are
7
# text.
7
# text.
8
DefaultType text/plain
9
8
10
<IfModule mime_module>
9
<IfModule mime_module>
11
# TypesConfig points to the file containing the list of mappings from
10
# TypesConfig points to the file containing the list of mappings from
(-)a/apache2/modules.d/40_mod_ssl.conf (-5 / +2 lines)
Lines 47-63 SSLRandomSeed connect builtin Link Here
47
# stdout.
47
# stdout.
48
SSLPassPhraseDialog  builtin
48
SSLPassPhraseDialog  builtin
49
49
50
<IfDefine CACHE>
50
## Inter-Process Session Cache:
51
## Inter-Process Session Cache:
51
# Configure the SSL Session Cache: First the mechanism  to use and second the
52
# Configure the SSL Session Cache: First the mechanism  to use and second the
52
# expiring timeout (in seconds).
53
# expiring timeout (in seconds).
53
#SSLSessionCache		dbm:/var/run/ssl_scache
54
#SSLSessionCache		dbm:/var/run/ssl_scache
54
SSLSessionCache			shmcb:/var/run/ssl_scache(512000)
55
SSLSessionCache			shmcb:/var/run/ssl_scache(512000)
55
SSLSessionCacheTimeout  300
56
SSLSessionCacheTimeout  300
56
57
</IfDefine>
57
## Semaphore:
58
# Configure the path to the mutual exclusion semaphore the SSL engine uses
59
# internally for inter-process synchronization.
60
SSLMutex  file:/var/run/ssl_mutex
61
</IfDefine>
58
</IfDefine>
62
59
63
# vim: ts=4 filetype=apache
60
# vim: ts=4 filetype=apache
(-)a/apache2/vhosts.d/00_default_vhost.conf (-3 lines)
Lines 25-33 Link Here
25
#Listen 12.34.56.78:80
25
#Listen 12.34.56.78:80
26
Listen 80
26
Listen 80
27
27
28
# Use name-based virtual hosting.
29
NameVirtualHost *:80
30
31
# When virtual hosts are enabled, the main host defined in the default
28
# When virtual hosts are enabled, the main host defined in the default
32
# httpd.conf configuration will go away. We redefine it here so that it is
29
# httpd.conf configuration will go away. We redefine it here so that it is
33
# still available.
30
# still available.
(-)a/conf.d/apache2 (-1 / +1 lines)
Lines 33-39 Link Here
33
#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
33
#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
34
#                     when you enable SSL)
34
#                     when you enable SSL)
35
#
35
#
36
APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE"
36
APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D SSL -D SSL_DEFAULT_VHOST -D LANGUAGE -D CACHE"
37
37
38
# Extended options for advanced uses of Apache ONLY
38
# Extended options for advanced uses of Apache ONLY
39
# You don't need to edit these unless you are doing crazy Apache stuff
39
# You don't need to edit these unless you are doing crazy Apache stuff

Return to bug 410607