diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:19 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:45 +0100 |
| commit | 2a463b3cd73c32ee9dcd508248d0194923f435f4 (patch) | |
| tree | 2ff478255a77a55031056790918b6f983bb7b20a /docs/conf/extra | |
| parent | 86d5cc79d9d6750da8771fdb0c9ab22c19b8ad45 (diff) | |
| download | apache2-2a463b3cd73c32ee9dcd508248d0194923f435f4.tar.gz | |
Imported Upstream version 2.4.9upstream/2.4.9
Diffstat (limited to 'docs/conf/extra')
| -rw-r--r-- | docs/conf/extra/httpd-manual.conf.in | 2 | ||||
| -rw-r--r-- | docs/conf/extra/httpd-ssl.conf.in | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/docs/conf/extra/httpd-manual.conf.in b/docs/conf/extra/httpd-manual.conf.in index d5c7c475..4d7ee7e6 100644 --- a/docs/conf/extra/httpd-manual.conf.in +++ b/docs/conf/extra/httpd-manual.conf.in @@ -20,7 +20,7 @@ AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "@exp </Files> # .tr is text/troff in mime.types! <Files *.html.tr.utf8> - ForceType text/html + ForceType "text/html; charset=utf-8" </Files> AddLanguage da .da diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in index d65889cf..21ef9bb8 100644 --- a/docs/conf/extra/httpd-ssl.conf.in +++ b/docs/conf/extra/httpd-ssl.conf.in @@ -33,9 +33,6 @@ # When we also provide SSL we have to listen to the # standard HTTP port (see above) and to the HTTPS port # -# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two -# Listen directives: "Listen [::]:@@SSLPort@@" and "Listen 0.0.0.0:@@SSLPort@@" -# Listen @@SSLPort@@ ## |