summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2008-09-12 09:38:43 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:57 +0100
commitbf86e70b683177d7cb4f319fe213667f5f6c11ed (patch)
treef2adfa56a8c172fdb64e02c69f9c8a02f3974cb8
parent68aa6ca3054aee014c8bd97298b3992aa2c89884 (diff)
downloadapache2-bf86e70b683177d7cb4f319fe213667f5f6c11ed.tar.gz
Revert the attempted fix for .es
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@821 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/README.Debian16
-rw-r--r--debian/changelog8
-rw-r--r--debian/config-dir/mods-available/mime.conf4
3 files changed, 26 insertions, 2 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 7053ee68..778c6911 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -275,3 +275,19 @@ See /usr/share/doc/apache2.2-common/NEWS.Debian.gz
In most cases this means that no matching VirtualHost definition could be
found for an incoming request.
+
+5) Support for Spanish and Turkish language with mod_negotiation
+
+Currently Apache will send Spanish and Turkish language files with the wrong
+mime types because the extensions .es and .tr have entries in /etc/mime.types
+for application/ecmascript and application/x-troff.
+
+In order to make Spanish and Turkish language support work, you need to either
+remove these entries from /etc/mime.types, or add something like
+
+ <Files *.html.tr.utf8>
+ ForceType text/html
+ </Files>
+
+to your Apache configuration. Of course, this has to be ajusted to the actual
+filenames you use.
diff --git a/debian/changelog b/debian/changelog
index b7fbc468..e703b74a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.2.9-9) UNRELEASED; urgency=low
+
+ * Revert the attempted fix for #496080 because it did not work due to
+ upstream PR 38330. Instead, document the problem and possible workarounds
+ in README.Debian.
+
+ -- Stefan Fritsch <sf@debian.org> Fri, 12 Sep 2008 11:06:09 +0200
+
apache2 (2.2.9-8) unstable; urgency=low
* Fix Spanish language support which was broken by .es being added to
diff --git a/debian/config-dir/mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
index 5404fe4c..b6954a31 100644
--- a/debian/config-dir/mods-available/mime.conf
+++ b/debian/config-dir/mods-available/mime.conf
@@ -73,8 +73,7 @@ AddLanguage de .de
AddLanguage el .el
AddLanguage en .en
AddLanguage eo .eo
-# remove conflicting type application/ecmascript from .es
-RemoveType es
+# See README.Debian for Spanish
AddLanguage es .es
AddLanguage et .et
AddLanguage fr .fr
@@ -92,6 +91,7 @@ AddLanguage pt .pt
AddLanguage pt-BR .pt-br
AddLanguage ru .ru
AddLanguage sv .sv
+# See README.Debian for Turkish
AddLanguage tr .tr
AddLanguage zh-CN .zh-cn
AddLanguage zh-TW .zh-tw