Annotation of /trunk/apache2/patches/apache2-2.2.4-default-httpd-config.patch
Parent Directory | Revision Log
Revision 231 -
(hide annotations)
(download)
Sat Jun 30 02:24:36 2007 UTC (17 years, 3 months ago) by niro
File size: 2271 byte(s)
Sat Jun 30 02:24:36 2007 UTC (17 years, 3 months ago) by niro
File size: 2271 byte(s)
files for apache-2.2.4-r1
1 | niro | 231 | diff -Naur httpd-2.2.4/docs/conf/httpd.conf.in httpd-2.2.4-magellan/docs/conf/httpd.conf.in |
2 | --- httpd-2.2.4/docs/conf/httpd.conf.in 2005-11-29 17:10:50.000000000 +0100 | ||
3 | +++ httpd-2.2.4-magellan/docs/conf/httpd.conf.in 2007-06-30 03:32:00.000000000 +0200 | ||
4 | @@ -359,43 +359,43 @@ | ||
5 | |||
6 | # Supplemental configuration | ||
7 | # | ||
8 | -# The configuration files in the @rel_sysconfdir@/extra/ directory can be | ||
9 | +# The configuration files in the @rel_sysconfdir@/modules.d/ directory can be | ||
10 | # included to add extra features or to modify the default configuration of | ||
11 | # the server, or you may simply copy their contents here and change as | ||
12 | # necessary. | ||
13 | |||
14 | # Server-pool management (MPM specific) | ||
15 | -#Include @rel_sysconfdir@/extra/httpd-mpm.conf | ||
16 | +Include @rel_sysconfdir@/modules.d/mpm.conf | ||
17 | |||
18 | # Multi-language error messages | ||
19 | -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf | ||
20 | +#Include @rel_sysconfdir@/modules.d/multilang-errordoc.conf | ||
21 | |||
22 | # Fancy directory listings | ||
23 | -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf | ||
24 | +#Include @rel_sysconfdir@/modules.d/autoindex.conf | ||
25 | |||
26 | # Language settings | ||
27 | -#Include @rel_sysconfdir@/extra/httpd-languages.conf | ||
28 | +#Include @rel_sysconfdir@/modules.d/languages.conf | ||
29 | |||
30 | # User home directories | ||
31 | -#Include @rel_sysconfdir@/extra/httpd-userdir.conf | ||
32 | +#Include @rel_sysconfdir@/modules.d/userdir.conf | ||
33 | |||
34 | # Real-time info on requests and configuration | ||
35 | -#Include @rel_sysconfdir@/extra/httpd-info.conf | ||
36 | +#Include @rel_sysconfdir@/modules.d/info.conf | ||
37 | |||
38 | # Virtual hosts | ||
39 | -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf | ||
40 | +#Include @rel_sysconfdir@/modules.d/vhosts.conf | ||
41 | |||
42 | # Local access to the Apache HTTP Server Manual | ||
43 | -#Include @rel_sysconfdir@/extra/httpd-manual.conf | ||
44 | +#Include @rel_sysconfdir@/modules.d/manual.conf | ||
45 | |||
46 | # Distributed authoring and versioning (WebDAV) | ||
47 | -#Include @rel_sysconfdir@/extra/httpd-dav.conf | ||
48 | +#Include @rel_sysconfdir@/modules.d/dav.conf | ||
49 | |||
50 | # Various default settings | ||
51 | -#Include @rel_sysconfdir@/extra/httpd-default.conf | ||
52 | +Include @rel_sysconfdir@/modules.d/default.conf | ||
53 | |||
54 | # Secure (SSL/TLS) connections | ||
55 | -#Include @rel_sysconfdir@/extra/httpd-ssl.conf | ||
56 | +#Include @rel_sysconfdir@/modules.d/ssl.conf | ||
57 | # | ||
58 | # Note: The following must must be present to support | ||
59 | # starting without SSL on platforms with no /dev/random equivalent |