Fix negotiation so that we prefer an encoded variant over an unencoded

variant if the user-agent explicitly says it can accept that encoding.
Previously we always preferred the unencoded variant.

PR:		3447
Submitted by:	Paul Ausbeck <paula@alumni.cse.ucsc.edu>
Reviewed by:	Paul Sutton

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

diff --git a/docs/manual/content-negotiation.html b/docs/manual/content-negotiation.html
index 73e534e6f93c302cf00ec0209f20f063b8994fc0..72d5a1356d4585680ed22dc6463257c237d94701 100644 (file)
--- a/docs/manual/content-negotiation.html
+++ b/docs/manual/content-negotiation.html
@@ -301,9 +301,12 @@ remains, move onto the next test.
 <LI>Select the variants with the highest 'level' media parameter
   (used to give the version of text/html media types).
 
-<LI>Select only unencoded variants, if there is a mix of encoded
-  and non-encoded variants. If either all variants are encoded
-  or all variants are not encoded, select all.
+<LI>Select the variants with the best encoding. If there are
+  variants with an encoding that is acceptable to the user-agent,
+  select only these variants. Otherwise if there is a mix of encoded
+  and non-encoded variants, select only the unencoded variants.
+  If either all variants are encoded or all variants are not encoded, 
+  select all variants.
 
 <LI>Select only variants with acceptable charset media parameters,
   as given on the Accept-Charset header line. Charset ISO-8859-1

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 73e534e6f93c302cf00ec0209f20f063b8994fc0..72d5a1356d4585680ed22dc6463257c237d94701 100644 (file)
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -301,9 +301,12 @@ remains, move onto the next test.
 <LI>Select the variants with the highest 'level' media parameter
   (used to give the version of text/html media types).
 
-<LI>Select only unencoded variants, if there is a mix of encoded
-  and non-encoded variants. If either all variants are encoded
-  or all variants are not encoded, select all.
+<LI>Select the variants with the best encoding. If there are
+  variants with an encoding that is acceptable to the user-agent,
+  select only these variants. Otherwise if there is a mix of encoded
+  and non-encoded variants, select only the unencoded variants.
+  If either all variants are encoded or all variants are not encoded, 
+  select all variants.
 
 <LI>Select only variants with acceptable charset media parameters,
   as given on the Accept-Charset header line. Charset ISO-8859-1