New directive, new docs

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

diff --git a/CHANGES b/CHANGES
index a6cf05db3f2d9cae131af23b626766d5d97c1b41..bf435ee90260ef99da74ec0c5757ace3d37f76fa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.30-dev
 
+  *) Introduced the ForceLanguagePriority directive, to prevent
+     returning MULTIPLE_CHOICES or NONE_ACCEPTABLE in some cases,
+     when using Multiviews.  [William Rowe]
+
   *) Fix a problem which prevented mod_cgid and suexec from working
      together reliably [Greg Ames]
 

diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index 58929b8f68ed21a9b1892be5db22825a17a4a28c..e599bc7cf6780d82e7b476cde8ed844261de4185 100644 (file)
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -306,6 +306,9 @@
 
       <li><a href="core.html#files">&lt;Files&gt;</a></li>
 
+      <li><a href="mod_negotiation.html#forcelanguagepriority"
+           >ForceLanguagePriority</a></li>
+
       <li><a
       href="core.html#filesmatch">&lt;FilesMatch&gt;</a></li>
 

diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index ae7bf9f5e21fa0d4d86394660b818c0e2f7fa69d..386fb9bc75744f694fe8a17b0dab5b7bae61e941 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -47,9 +47,8 @@
     <h2>Directives</h2>
 
     <ul>
-      <li><a
-      href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
-
+      <li><a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+      <li><a href="#forcelanguagepriority">ForceLanguagePriority</a></li>
       <li><a href="#languagepriority">LanguagePriority</a></li>
     </ul>
     <strong>See also</strong>: <a
@@ -183,6 +182,57 @@
     itself.</p>
     <hr />
 
+    <h2><a id="forcelanguagepriority"
+    name="forcelanguagepriority">ForceLanguagePriority</a> directive</h2>
+    <!--%plaintext &lt;?INDEX {\tt ForceLanguagePriority} directive&gt; -->
+    <a href="directive-dict.html#Syntax"
+    rel="Help"><strong>Syntax:</strong></a> ForceLanguagePriority
+    <em>None</em> | [<em>Prefer</em>] [<em>Fallback</em>]</em><br />
+     <a href="directive-dict.html#Context"
+    rel="Help"><strong>Context:</strong></a> server config, virtual
+    host, directory, .htaccess<br />
+     <a href="directive-dict.html#Override"
+    rel="Help"><strong>Override:</strong></a> FileInfo<br />
+     <a href="directive-dict.html#Status"
+    rel="Help"><strong>Status:</strong></a> Base<br />
+     <a href="directive-dict.html#Module"
+    rel="Help"><strong>Module:</strong></a> mod_negotiation 
+
+    <p>The <em>ForceLanguagePriority</em> directive uses the given
+    <em>LanguagePriority</em> to satisfy two common negotation results.</p>
+
+    <p><em>ForceLanguagePriority Prefer</em> uses <em>LanguagePriority</em>
+    to serve a one valid result, rather than returning an HTTP result 300,
+    MULTIPLE CHOICES, when there are several equally valid choices.  
+    If the directives below were given, and the user's Accept-Language 
+    header assigned en and de each as quality .500 (equally acceptable)
+    then then first matching variant, en, will be served;</p>
+
+    <blockquote>
+      <code>LanguagePriority en fr de</code>
+      <code>ForceLanguagePriority Prefer</code>
+    </blockquote>
+
+    <p><em>ForceLanguagePriority Fallback</em> uses <em>LanguagePriority</em>
+    to serve a valid result, rather than returning an HTTP result 406,
+    NOT ACCEPTABLE.  If the directives below were given, and the user's
+    Accept-Language only permitted an es langauge response, but such a
+    variant isn't found, then the first variant from the LanguagePriority 
+    list below will be served;</p>
+
+    <blockquote>
+      <code>LanguagePriority en fr de</code>
+      <code>ForceLanguagePriority Fallback</code>
+    </blockquote>
+
+    <p>Both options, Prefer and Fallback, may be specified, so either the
+    first matching variant from LanguagePriority will be served if more
+    that one variant is acceptable, or first available document will be
+    served if none of the variants matched the client's acceptable list of
+    languages.</p>
+
+    <hr />
+
     <h2><a id="languagepriority"
     name="languagepriority">LanguagePriority</a> directive</h2>
     <!--%plaintext &lt;?INDEX {\tt LanguagePriority} directive&gt; -->