From: André Malo <nd@apache.org>
Date: Sun, 4 May 2003 23:40:20 +0000 (+0000)
Subject: make sure, the preferred language gets its chance, even when it's not
X-Git-Tag: pre_ajp_proxy~1741
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72016f800a4a25c25444a2167779babd5c47e0cb;p=thirdparty%2Fapache%2Fhttpd.git

make sure, the preferred language gets its chance, even when it's not
listed in browser's accept-language list.


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

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index b2db9f4d815..1808d286249 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2379,7 +2379,16 @@ static int best_match(negotiation_state *neg, var_rec **pbest)
              * variant.
              */
             set_accept_quality(neg, variant);
-            set_language_quality(neg, variant);
+            /* accept the preferred language, even when it's not listed within
+             * the Accept-Language header
+             */
+            if (preferred_language) {
+                variant->lang_quality = 1.0f;
+                variant->definite = 1;
+            }
+            else {
+                set_language_quality(neg, variant);
+            }
             set_encoding_quality(neg, variant);
             set_charset_quality(neg, variant);