Annotation of /trunk/apache2/patches/apache2-2.4.3-default-httpd-config-2.patch
Parent Directory | Revision Log
Revision 1931 -
(hide annotations)
(download)
Wed Oct 31 11:54:51 2012 UTC (11 years, 10 months ago) by niro
File size: 2380 byte(s)
Wed Oct 31 11:54:51 2012 UTC (11 years, 10 months ago) by niro
File size: 2380 byte(s)
-fixed proxy-html configuration
1 | niro | 1931 | --- httpd-2.4.3/docs/conf/httpd.conf.in 2012-08-14 20:53:31.000000000 +0000 |
2 | +++ httpd-2.4.3-magellan/docs/conf/httpd.conf.in 2012-10-31 12:53:29.385930129 +0000 | ||
3 | @@ -355,48 +355,46 @@ | ||
4 | |||
5 | # Supplemental configuration | ||
6 | # | ||
7 | -# The configuration files in the @rel_sysconfdir@/extra/ directory can be | ||
8 | +# The configuration files in the @rel_sysconfdir@/modules.d/ directory can be | ||
9 | # included to add extra features or to modify the default configuration of | ||
10 | # the server, or you may simply copy their contents here and change as | ||
11 | # necessary. | ||
12 | |||
13 | # Server-pool management (MPM specific) | ||
14 | -#Include @rel_sysconfdir@/extra/httpd-mpm.conf | ||
15 | +Include @rel_sysconfdir@/modules.d/mpm.conf | ||
16 | |||
17 | # Multi-language error messages | ||
18 | -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf | ||
19 | +#Include @rel_sysconfdir@/modules.d/multilang-errordoc.conf | ||
20 | |||
21 | # Fancy directory listings | ||
22 | -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf | ||
23 | +#Include @rel_sysconfdir@/modules.d/autoindex.conf | ||
24 | |||
25 | # Language settings | ||
26 | -#Include @rel_sysconfdir@/extra/httpd-languages.conf | ||
27 | +#Include @rel_sysconfdir@/modules.d/languages.conf | ||
28 | |||
29 | # User home directories | ||
30 | -#Include @rel_sysconfdir@/extra/httpd-userdir.conf | ||
31 | +#Include @rel_sysconfdir@/modules.d/userdir.conf | ||
32 | |||
33 | # Real-time info on requests and configuration | ||
34 | -#Include @rel_sysconfdir@/extra/httpd-info.conf | ||
35 | +#Include @rel_sysconfdir@/modules.d/info.conf | ||
36 | |||
37 | # Virtual hosts | ||
38 | -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf | ||
39 | +#Include @rel_sysconfdir@/modules.d/vhosts.conf | ||
40 | |||
41 | # Local access to the Apache HTTP Server Manual | ||
42 | -#Include @rel_sysconfdir@/extra/httpd-manual.conf | ||
43 | +#Include @rel_sysconfdir@/modules.d/manual.conf | ||
44 | |||
45 | # Distributed authoring and versioning (WebDAV) | ||
46 | -#Include @rel_sysconfdir@/extra/httpd-dav.conf | ||
47 | +#Include @rel_sysconfdir@/modules.d/dav.conf | ||
48 | |||
49 | # Various default settings | ||
50 | -#Include @rel_sysconfdir@/extra/httpd-default.conf | ||
51 | +Include @rel_sysconfdir@/modules.d/default.conf | ||
52 | |||
53 | # Configure mod_proxy_html to understand HTML4/XHTML1 | ||
54 | -<IfModule proxy_html_module> | ||
55 | -Include @rel_sysconfdir@/extra/proxy-html.conf | ||
56 | -</IfModule> | ||
57 | +#Include @rel_sysconfdir@/modules.d/proxy-html.conf | ||
58 | |||
59 | # Secure (SSL/TLS) connections | ||
60 | -#Include @rel_sysconfdir@/extra/httpd-ssl.conf | ||
61 | +#Include @rel_sysconfdir@/modules.d/ssl.conf | ||
62 | # | ||
63 | # Note: The following must must be present to support | ||
64 | # starting without SSL on platforms with no /dev/random equivalent |