Gotta have an error doc to serve, even if it's not their favorite

  language.

  From the http://www.ethnologue.com/ survey of languages, their data
  is, in descending order [in millions, by primary and pri+sec speakers]
  EN  341  508
  ES  322  417
  DE  100  128
  FR   77  128

  So that's the order I chose, and why.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-nw.conf b/docs/conf/httpd-nw.conf
index ce91028b260bd3674673bd9336bae5f4ceef2e4b..d6f179899f21885c6b75ea3d17b5d4f4b64c37b2 100644 (file)
--- a/docs/conf/httpd-nw.conf
+++ b/docs/conf/httpd-nw.conf
@@ -638,6 +638,13 @@ AddLanguage hr .hr
 #
 LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
 
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
 #
 # Specify a default charset for all pages sent out. This is
 # always a good idea and opens the door for future internationalisation
@@ -793,6 +800,7 @@ AddType application/x-tar .tgz
 # copying them to /your/include/path/, even on a per-VirtualHost basis.
 #
 
+<IfModule mod_negotiation.c>
 <IfModule mod_include.c>
     Alias /error/ "@@ServerRoot@@/error/"
 
@@ -803,6 +811,8 @@ AddType application/x-tar .tgz
         AddHandler type-map var
         Order allow,deny
         Allow from all
+       LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
     </Directory>
 
     ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
@@ -824,6 +834,7 @@ AddType application/x-tar .tgz
     ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
 
 </IfModule>
+</IfModule>
 
 #
 # The following directives modify normal HTTP response behavior.

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 4055b06c4d6feb183c139151807860bbc52864ad..f46cdfb1f4b45ceec3511d58d42ef10a42af5f68 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -717,6 +717,13 @@ AddLanguage hr .hr
 #
 LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
 
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
 #
 # Specify a default charset for all pages sent out. This is
 # always a good idea and opens the door for future internationalisation
@@ -851,6 +858,7 @@ AddHandler type-map var
 # copying them to /your/include/path/, even on a per-VirtualHost basis.
 #
 
+<IfModule mod_negotiation.c>
 <IfModule mod_include.c>
     Alias /error/ "@@ServerRoot@@/error/"
 
@@ -861,6 +869,8 @@ AddHandler type-map var
         AddHandler type-map var
         Order allow,deny
         Allow from all
+       LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
     </Directory>
 
     ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
@@ -882,6 +892,7 @@ AddHandler type-map var
     ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
 
 </IfModule>
+</IfModule>
 
 #
 # The following directives modify normal HTTP response behavior to

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 42149c22a8bdb3347e73837df39dd0f484d954b8..386e4507bf67e9b3bbf4786d0771090c8e808855 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -614,6 +614,13 @@ AddLanguage hr .hr
 #
 LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
 
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
 #
 # Specify a default charset for all pages sent out. This is
 # always a good idea and opens the door for future internationalisation
@@ -769,6 +776,7 @@ AddType application/x-tar .tgz
 # copying them to /your/include/path/, even on a per-VirtualHost basis.
 #
 
+<IfModule mod_negotiation.c>
 <IfModule mod_include.c>
     Alias /error/ "@@ServerRoot@@/error/"
 
@@ -779,6 +787,8 @@ AddType application/x-tar .tgz
         AddHandler type-map var
         Order allow,deny
         Allow from all
+       LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
     </Directory>
 
     ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
@@ -800,6 +810,7 @@ AddType application/x-tar .tgz
     ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
 
 </IfModule>
+</IfModule>
 
 #
 # The following directives modify normal HTTP response behavior.