The content-negotiation docs are a little misleading about what the

RFC says.

PR: 18443

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

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index fbbf07d08ddd77864ed5f4d74a93fcaedaca67f5..6e48c2392368423efc4956f5286889fdb2e8f3d1 100644 (file)
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -410,7 +410,7 @@ Negotiation</a></li>
 <div class="example"><p><code>Accept: image/*, */*</code></p></div>
 
     <p>would indicate that any type starting "image/" is acceptable,
-    as is any other type (so the first "image/*" is redundant).
+    as is any other type.
     Some browsers routinely send wildcards in addition to explicit
     types they can handle. For example:</p>
 
@@ -419,11 +419,8 @@ Negotiation</a></li>
 </code></p></div>
     <p>The intention of this is to indicate that the explicitly listed
     types are preferred, but if a different representation is
-    available, that is ok too. However under the basic algorithm,
-    as given above, the */* wildcard has exactly equal preference
-    to all the other types, so they are not being preferred. The
-    browser should really have sent a request with a lower quality
-    (preference) value for *.*, such as:</p>
+    available, that is ok too.  Using explicit quality values,
+    what the browser really wants is something like:</p>
 <div class="example"><p><code>
   Accept: text/html, text/plain, image/gif, image/jpeg, */*; q=0.01
 </code></p></div>
@@ -439,7 +436,7 @@ Negotiation</a></li>
     preferred over matches against "*/*". If any media type on the
     Accept: header contains a q factor, these special values are
     <em>not</em> applied, so requests from browsers which send the
-    correct information to start with work as expected.</p>
+    explicit information to start with work as expected.</p>
 
 
 <h3><a name="exceptions" id="exceptions">Language Negotiation Exceptions</a></h3>

diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index 5cba72ae8393ffdcad28f7a29d8eaebc2a07f51f..13de47dc34f7ed9db9771c4f7f4de5c0536e199b 100644 (file)
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -395,7 +395,7 @@
 <example>Accept: image/*, */*</example>
 
     <p>would indicate that any type starting "image/" is acceptable,
-    as is any other type (so the first "image/*" is redundant).
+    as is any other type.
     Some browsers routinely send wildcards in addition to explicit
     types they can handle. For example:</p>
 
@@ -404,11 +404,8 @@
 </example>
     <p>The intention of this is to indicate that the explicitly listed
     types are preferred, but if a different representation is
-    available, that is ok too. However under the basic algorithm,
-    as given above, the */* wildcard has exactly equal preference
-    to all the other types, so they are not being preferred. The
-    browser should really have sent a request with a lower quality
-    (preference) value for *.*, such as:</p>
+    available, that is ok too.  Using explicit quality values,
+    what the browser really wants is something like:</p>
 <example>
   Accept: text/html, text/plain, image/gif, image/jpeg, */*; q=0.01
 </example>
@@ -424,7 +421,7 @@
     preferred over matches against "*/*". If any media type on the
     Accept: header contains a q factor, these special values are
     <em>not</em> applied, so requests from browsers which send the
-    correct information to start with work as expected.</p>
+    explicit information to start with work as expected.</p>
 </section>
 
 <section id="exceptions"><title>Language Negotiation Exceptions</title>