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 / +5 lines)
Lines 61-69 ServerRoot "/usr/lib64/apache2" Link Here
61
LoadModule actions_module modules/mod_actions.so
61
LoadModule actions_module modules/mod_actions.so
62
LoadModule alias_module modules/mod_alias.so
62
LoadModule alias_module modules/mod_alias.so
63
LoadModule auth_basic_module modules/mod_auth_basic.so
63
LoadModule auth_basic_module modules/mod_auth_basic.so
64
LoadModule authn_core_module modules/mod_authn_core.so
64
LoadModule authn_anon_module modules/mod_authn_anon.so
65
LoadModule authn_anon_module modules/mod_authn_anon.so
65
LoadModule authn_dbm_module modules/mod_authn_dbm.so
66
LoadModule authn_dbm_module modules/mod_authn_dbm.so
66
LoadModule authn_file_module modules/mod_authn_file.so
67
LoadModule authn_file_module modules/mod_authn_file.so
68
LoadModule authz_core_module modules/mod_authz_core.so
67
LoadModule authz_dbm_module modules/mod_authz_dbm.so
69
LoadModule authz_dbm_module modules/mod_authz_dbm.so
68
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
70
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
69
LoadModule authz_host_module modules/mod_authz_host.so
71
LoadModule authz_host_module modules/mod_authz_host.so
Lines 72-87 LoadModule authz_user_module modules/mod_authz_user.so Link Here
72
LoadModule autoindex_module modules/mod_autoindex.so
74
LoadModule autoindex_module modules/mod_autoindex.so
73
<IfDefine CACHE>
75
<IfDefine CACHE>
74
LoadModule cache_module modules/mod_cache.so
76
LoadModule cache_module modules/mod_cache.so
77
LoadModule file_cache_module modules/mod_file_cache.so
78
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
75
</IfDefine>
79
</IfDefine>
76
LoadModule cgi_module modules/mod_cgi.so
80
LoadModule cgi_module modules/mod_cgi.so
77
LoadModule cgid_module modules/mod_cgid.so
81
LoadModule cgid_module modules/mod_cgid.so
78
<IfDefine DAV>
82
<IfDefine DAV>
79
LoadModule dav_module modules/mod_dav.so
83
LoadModule dav_module modules/mod_dav.so
80
</IfDefine>
81
<IfDefine DAV>
82
LoadModule dav_fs_module modules/mod_dav_fs.so
84
LoadModule dav_fs_module modules/mod_dav_fs.so
83
</IfDefine>
84
<IfDefine DAV>
85
LoadModule dav_lock_module modules/mod_dav_lock.so
85
LoadModule dav_lock_module modules/mod_dav_lock.so
86
</IfDefine>
86
</IfDefine>
87
LoadModule deflate_module modules/mod_deflate.so
87
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
89
LoadModule env_module modules/mod_env.so
90
LoadModule expires_module modules/mod_expires.so
90
LoadModule expires_module modules/mod_expires.so
91
LoadModule ext_filter_module modules/mod_ext_filter.so
91
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
92
LoadModule filter_module modules/mod_filter.so
96
LoadModule headers_module modules/mod_headers.so
93
LoadModule headers_module modules/mod_headers.so
97
LoadModule include_module modules/mod_include.so
94
LoadModule include_module modules/mod_include.so
Lines 118-123 LoadModule userdir_module modules/mod_userdir.so Link Here
118
</IfDefine>
115
</IfDefine>
119
LoadModule usertrack_module modules/mod_usertrack.so
116
LoadModule usertrack_module modules/mod_usertrack.so
120
LoadModule vhost_alias_module modules/mod_vhost_alias.so
117
LoadModule vhost_alias_module modules/mod_vhost_alias.so
118
LoadModule unixd_module modules/mod_unixd.so
121
119
122
# If you wish httpd to run as a different user or group, you must run
120
# If you wish httpd to run as a different user or group, you must run
123
# httpd as root initially and it will switch.
121
# httpd as root initially and it will switch.
(-)a/apache2/modules.d/00_default_settings.conf (-4 / +3 lines)
Lines 107-114 LogLevel warn Link Here
107
<Directory />
107
<Directory />
108
	Options FollowSymLinks
108
	Options FollowSymLinks
109
	AllowOverride None
109
	AllowOverride None
110
	Order deny,allow
110
    Require all denied
111
	Deny from all
112
</Directory>
111
</Directory>
113
112
114
# DirectoryIndex: sets the file that Apache will serve if a directory
113
# DirectoryIndex: sets the file that Apache will serve if a directory
Lines 127-134 LogLevel warn Link Here
127
# The following lines prevent .htaccess and .htpasswd files from being
126
# The following lines prevent .htaccess and .htpasswd files from being
128
# viewed by Web clients.
127
# viewed by Web clients.
129
<FilesMatch "^\.ht">
128
<FilesMatch "^\.ht">
130
	Order allow,deny
129
   Require all denied
131
	Deny from all
132
</FilesMatch>
130
</FilesMatch>
133
131
132
Mutex default:/var/run
134
# vim: ts=4 filetype=apache
133
# vim: ts=4 filetype=apache
(-)a/apache2/modules.d/00_error_documents.conf (-2 / +1 lines)
Lines 30-37 Alias /error/ "/usr/share/apache2/error/" Link Here
30
	Options IncludesNoExec
30
	Options IncludesNoExec
31
	AddOutputFilter Includes html
31
	AddOutputFilter Includes html
32
	AddHandler type-map var
32
	AddHandler type-map var
33
	Order allow,deny
33
    Require all granted
34
	Allow from all
35
	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
34
	LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
36
	ForceLanguagePriority Prefer Fallback
35
	ForceLanguagePriority Prefer Fallback
37
</Directory>
36
</Directory>
(-)a/apache2/modules.d/00_mod_autoindex.conf (-2 / +1 lines)
Lines 7-14 Alias /icons/ "/usr/share/apache2/icons/" Link Here
7
<Directory "/usr/share/apache2/icons">
7
<Directory "/usr/share/apache2/icons">
8
	Options Indexes MultiViews
8
	Options Indexes MultiViews
9
	AllowOverride None
9
	AllowOverride None
10
	Order allow,deny
10
    Require all granted
11
	Allow from all
12
</Directory>
11
</Directory>
13
</IfModule>
12
</IfModule>
14
13
(-)a/apache2/modules.d/00_mod_info.conf (-3 / +1 lines)
Lines 3-11 Link Here
3
# http://servername/server-info
3
# http://servername/server-info
4
<Location /server-info>
4
<Location /server-info>
5
	SetHandler server-info
5
	SetHandler server-info
6
	Order deny,allow
6
    Require ip 127.0.0.1
7
	Deny from all
8
	Allow from 127.0.0.1
9
</Location>
7
</Location>
10
</IfDefine>
8
</IfDefine>
11
9
(-)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/00_mod_status.conf (-3 / +1 lines)
Lines 3-11 Link Here
3
# with the URL of http://servername/server-status
3
# with the URL of http://servername/server-status
4
<Location /server-status>
4
<Location /server-status>
5
	SetHandler server-status
5
	SetHandler server-status
6
	Order deny,allow
6
	Require ip 127.0.0.1
7
	Deny from all
8
	Allow from 127.0.0.1
9
</Location>
7
</Location>
10
8
11
# ExtendedStatus controls whether Apache will generate "full" status
9
# ExtendedStatus controls whether Apache will generate "full" status
(-)a/apache2/modules.d/00_mod_userdir.conf (-4 / +2 lines)
Lines 11-22 UserDir public_html Link Here
11
	AllowOverride FileInfo AuthConfig Limit Indexes
11
	AllowOverride FileInfo AuthConfig Limit Indexes
12
	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
12
	Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
13
	<Limit GET POST OPTIONS>
13
	<Limit GET POST OPTIONS>
14
		Order allow,deny
14
         Require all granted
15
		Allow from all
16
	</Limit>
15
	</Limit>
17
	<LimitExcept GET POST OPTIONS>
16
	<LimitExcept GET POST OPTIONS>
18
		Order deny,allow
17
         Require all denied
19
		Deny from all
20
	</LimitExcept>
18
	</LimitExcept>
21
</Directory>
19
</Directory>
22
20
(-)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/modules.d/46_mod_ldap.conf (-3 / +1 lines)
Lines 11-19 LDAPOpCacheTTL 600 Link Here
11
11
12
<Location /ldap-status>
12
<Location /ldap-status>
13
	SetHandler ldap-status
13
	SetHandler ldap-status
14
	Order deny,allow
14
	Require ip 127.0.0.1
15
	Deny from all
16
	Allow from 127.0.0.1
17
</Location>
15
</Location>
18
</IfDefine>
16
</IfDefine>
19
17
(-)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/apache2/vhosts.d/default_vhost.include (-4 / +2 lines)
Lines 31-38 DocumentRoot "/var/www/localhost/htdocs" Link Here
31
	AllowOverride All
31
	AllowOverride All
32
32
33
	# Controls who can get stuff from this server.
33
	# Controls who can get stuff from this server.
34
	Order allow,deny
34
    Require all granted	
35
	Allow from all
36
</Directory>
35
</Directory>
37
36
38
<IfModule alias_module>
37
<IfModule alias_module>
Lines 66-73 DocumentRoot "/var/www/localhost/htdocs" Link Here
66
<Directory "/var/www/localhost/cgi-bin">
65
<Directory "/var/www/localhost/cgi-bin">
67
	AllowOverride None
66
	AllowOverride None
68
	Options None
67
	Options None
69
	Order allow,deny
68
	Require all granted
70
	Allow from all
71
</Directory>
69
</Directory>
72
70
73
# vim: ts=4 filetype=apache
71
# vim: ts=4 filetype=apache
(-)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