From: William A. Rowe Jr Date: Sun, 30 Dec 2001 04:40:40 +0000 (+0000) Subject: New directive, new docs X-Git-Tag: 2.0.30~84 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cdca5f95bd8c1309c72a0cb150c2fa90ff09673;p=apache 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 a6cf05db3f..bf435ee902 100644 --- 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 58929b8f68..e599bc7cf6 100644 --- a/docs/manual/mod/directives.html +++ b/docs/manual/mod/directives.html @@ -306,6 +306,9 @@
  • <Files>
  • +
  • ForceLanguagePriority
  • +
  • <FilesMatch>
  • diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html index ae7bf9f5e2..386fb9bc75 100644 --- a/docs/manual/mod/mod_negotiation.html +++ b/docs/manual/mod/mod_negotiation.html @@ -47,9 +47,8 @@

    Directives

    See also:
    +

    ForceLanguagePriority directive

    + + Syntax: ForceLanguagePriority + None | [Prefer] [Fallback]
    + Context: server config, virtual + host, directory, .htaccess
    + Override: FileInfo
    + Status: Base
    + Module: mod_negotiation + +

    The ForceLanguagePriority directive uses the given + LanguagePriority to satisfy two common negotation results.

    + +

    ForceLanguagePriority Prefer uses LanguagePriority + 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;

    + +
    + LanguagePriority en fr de + ForceLanguagePriority Prefer +
    + +

    ForceLanguagePriority Fallback uses LanguagePriority + 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;

    + +
    + LanguagePriority en fr de + ForceLanguagePriority Fallback +
    + +

    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.

    + +
    +

    LanguagePriority directive