httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod mod_negotiation.html directives.html
Date Sun, 30 Dec 2001 04:40:40 GMT
wrowe       01/12/29 20:40:40

  Modified:    .        CHANGES
               docs/manual/mod mod_negotiation.html directives.html
  Log:
    New directive, new docs
  
  Revision  Changes    Path
  1.493     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.492
  retrieving revision 1.493
  diff -u -r1.492 -r1.493
  --- CHANGES	29 Dec 2001 01:36:59 -0000	1.492
  +++ CHANGES	30 Dec 2001 04:40:40 -0000	1.493
  @@ -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]
   
  
  
  
  1.20      +53 -3     httpd-2.0/docs/manual/mod/mod_negotiation.html
  
  Index: mod_negotiation.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_negotiation.html,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_negotiation.html	22 Sep 2001 19:36:01 -0000	1.19
  +++ mod_negotiation.html	30 Dec 2001 04:40:40 -0000	1.20
  @@ -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
  @@ -181,6 +180,57 @@
       <p>Prior to version 2.0, CacheNegotiatedDocs did not take an
       argument; it was turned on by the presence of the directive by
       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"
  
  
  
  1.94      +3 -0      httpd-2.0/docs/manual/mod/directives.html
  
  Index: directives.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/directives.html,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- directives.html	19 Dec 2001 18:16:40 -0000	1.93
  +++ directives.html	30 Dec 2001 04:40:40 -0000	1.94
  @@ -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>
   
  
  
  

Mime
View raw message