Changeset 1738 for draft-ietf-httpbis

Timestamp:

08/07/12 13:29:53 (9 years ago)

Author:

julian.reschke@…

Message:

Work-in-progress: hyperlink header field definitions(P5)

Location:

draft-ietf-httpbis/latest

Files:

• p2-semantics.html (modified) (18 diffs)
• p2-semantics.xml (modified) (4 diffs)
• p4-conditional.html (modified) (5 diffs)
• p4-conditional.xml (modified) (6 diffs)
• p5-range.html (modified) (11 diffs)
• p5-range.xml (modified) (13 diffs)
• p6-cache.html (modified) (4 diffs)
• p6-cache.xml (modified) (5 diffs)

draft-ietf-httpbis/latest/p2-semantics.html

@@ -980 +980 @@
       </p>
       <p id="rfc.section.2.3.2.p.3">The semantics of the GET method change to a "conditional GET" if the request message includes an If-Modified-Since, If-Unmodified-Since,
-         If-Match, If-None-Match, or If-Range header field. A conditional GET requests that the representation be transferred only
-         under the circumstances described by the conditional header field(s). The conditional GET request is intended to reduce unnecessary
-         network usage by allowing cached representations to be refreshed without requiring multiple requests or transferring data
-         already held by the client.
-      </p>
-      <p id="rfc.section.2.3.2.p.4">The semantics of the GET method change to a "partial GET" if the request message includes a Range header field. A partial
-         GET requests that only part of the representation be transferred, as described in <a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.1"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>. The partial GET request is intended to reduce unnecessary network usage by allowing partially-retrieved representations
+         If-Match, If-None-Match, or <a href="p5-range.html#header.if-range" class="smpl">If-Range</a> header field (<a href="#Part4" id="rfc.xref.Part4.1"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>). A conditional GET requests that the representation be transferred only under the circumstances described by the conditional
+         header field(s). The conditional GET request is intended to reduce unnecessary network usage by allowing cached representations
+         to be refreshed without requiring multiple requests or transferring data already held by the client.
+      </p>
+      <p id="rfc.section.2.3.2.p.4">The semantics of the GET method change to a "partial GET" if the request message includes a <a href="p5-range.html#range.retrieval.requests" class="smpl">Range</a> header field (<a href="#Part5" id="rfc.xref.Part5.1"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>). A partial GET requests that only part of the representation be transferred, as described in <a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.2"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>. The partial GET request is intended to reduce unnecessary network usage by allowing partially-retrieved representations
          to be completed without transferring data already held by the client.
       </p>
@@ -1084 +1082 @@
          the related resources.
       </p>
-      <p id="rfc.section.2.3.5.p.10">An origin server <em class="bcp14">SHOULD</em> reject any PUT request that contains a Content-Range header field, since it might be misinterpreted as partial content (or
-         might be partial content that is being mistakenly PUT as a full representation). Partial content updates are possible by targeting
-         a separately identified resource with state that overlaps a portion of the larger resource, or by using a different method
-         that has been specifically defined for partial updates (for example, the PATCH method defined in <a href="#RFC5789" id="rfc.xref.RFC5789.1"><cite title="PATCH Method for HTTP">[RFC5789]</cite></a>).
+      <p id="rfc.section.2.3.5.p.10">An origin server <em class="bcp14">SHOULD</em> reject any PUT request that contains a <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a> header field (<a href="p5-range.html#header.content-range" title="Content-Range">Section 5.2</a> of <a href="#Part5" id="rfc.xref.Part5.3"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>), since it might be misinterpreted as partial content (or might be partial content that is being mistakenly PUT as a full
+         representation). Partial content updates are possible by targeting a separately identified resource with state that overlaps
+         a portion of the larger resource, or by using a different method that has been specifically defined for partial updates (for
+         example, the PATCH method defined in <a href="#RFC5789" id="rfc.xref.RFC5789.1"><cite title="PATCH Method for HTTP">[RFC5789]</cite></a>).
       </p>
       <p id="rfc.section.2.3.5.p.11">Responses to the PUT method are not cacheable. If a PUT request passes through a cache that has one or more stored responses
@@ -1275 +1273 @@
                <tr>
                   <td class="left">If-Match</td>
-                  <td class="left"><a href="p4-conditional.html#header.if-match" title="If-Match">Section 3.1</a> of <a href="#Part4" id="rfc.xref.Part4.1"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.if-match" title="If-Match">Section 3.1</a> of <a href="#Part4" id="rfc.xref.Part4.2"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
                   <td class="left">If-Modified-Since</td>
-                  <td class="left"><a href="p4-conditional.html#header.if-modified-since" title="If-Modified-Since">Section 3.3</a> of <a href="#Part4" id="rfc.xref.Part4.2"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.if-modified-since" title="If-Modified-Since">Section 3.3</a> of <a href="#Part4" id="rfc.xref.Part4.3"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
                   <td class="left">If-None-Match</td>
-                  <td class="left"><a href="p4-conditional.html#header.if-none-match" title="If-None-Match">Section 3.2</a> of <a href="#Part4" id="rfc.xref.Part4.3"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.if-none-match" title="If-None-Match">Section 3.2</a> of <a href="#Part4" id="rfc.xref.Part4.4"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
                   <td class="left">If-Range</td>
-                  <td class="left"><a href="p5-range.html#header.if-range" title="If-Range">Section 5.3</a> of <a href="#Part5" id="rfc.xref.Part5.2"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td class="left"><a href="p5-range.html#header.if-range" title="If-Range">Section 5.3</a> of <a href="#Part5" id="rfc.xref.Part5.4"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
                <tr>
                   <td class="left">If-Unmodified-Since</td>
-                  <td class="left"><a href="p4-conditional.html#header.if-unmodified-since" title="If-Unmodified-Since">Section 3.4</a> of <a href="#Part4" id="rfc.xref.Part4.4"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.if-unmodified-since" title="If-Unmodified-Since">Section 3.4</a> of <a href="#Part4" id="rfc.xref.Part4.5"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
@@ -1303 +1301 @@
                <tr>
                   <td class="left">Range</td>
-                  <td class="left"><a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.3"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td class="left"><a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.5"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
                <tr>
@@ -1335 +1333 @@
                <tr>
                   <td class="left">Accept-Ranges</td>
-                  <td class="left"><a href="p5-range.html#header.accept-ranges" title="Accept-Ranges">Section 5.1</a> of <a href="#Part5" id="rfc.xref.Part5.4"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td class="left"><a href="p5-range.html#header.accept-ranges" title="Accept-Ranges">Section 5.1</a> of <a href="#Part5" id="rfc.xref.Part5.6"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
                <tr>
@@ -1351 +1349 @@
                <tr>
                   <td class="left">ETag</td>
-                  <td class="left"><a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.5"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.6"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
@@ -1407 +1405 @@
       </p>
       <h2 id="rfc.section.4.1"><a href="#rfc.section.4.1">4.1</a>&nbsp;<a id="overview.of.status.codes" href="#overview.of.status.codes">Overview of Status Codes</a></h2>
-      <p id="rfc.section.4.1.p.1">The status codes listed below are defined in this specification, <a href="p4-conditional.html#status.code.definitions" title="Status Code Definitions">Section 4</a> of <a href="#Part4" id="rfc.xref.Part4.6"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>, <a href="p5-range.html#status.code.definitions" title="Status Code Definitions">Section 3</a> of <a href="#Part5" id="rfc.xref.Part5.5"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>, and <a href="p7-auth.html#status.code.definitions" title="Status Code Definitions">Section 3</a> of <a href="#Part7" id="rfc.xref.Part7.5"><cite title="HTTP/1.1, part 7: Authentication">[Part7]</cite></a>. The reason phrases listed here are only recommendations — they can be replaced by local equivalents without affecting the
+      <p id="rfc.section.4.1.p.1">The status codes listed below are defined in this specification, <a href="p4-conditional.html#status.code.definitions" title="Status Code Definitions">Section 4</a> of <a href="#Part4" id="rfc.xref.Part4.7"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>, <a href="p5-range.html#status.code.definitions" title="Status Code Definitions">Section 3</a> of <a href="#Part5" id="rfc.xref.Part5.7"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>, and <a href="p7-auth.html#status.code.definitions" title="Status Code Definitions">Section 3</a> of <a href="#Part7" id="rfc.xref.Part7.5"><cite title="HTTP/1.1, part 7: Authentication">[Part7]</cite></a>. The reason phrases listed here are only recommendations — they can be replaced by local equivalents without affecting the
          protocol.
       </p>
@@ -1463 +1461 @@
                   <td class="left">206</td>
                   <td class="left">Partial Content</td>
-                  <td id="status.206" class="left"><a href="p5-range.html#status.206" title="206 Partial Content">Section 3.1</a> of <a href="#Part5" id="rfc.xref.Part5.6"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td id="status.206" class="left"><a href="p5-range.html#status.206" title="206 Partial Content">Section 3.1</a> of <a href="#Part5" id="rfc.xref.Part5.8"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
                <tr>
@@ -1488 +1486 @@
                   <td class="left">304</td>
                   <td class="left">Not Modified</td>
-                  <td id="status.304" class="left"><a href="p4-conditional.html#status.304" title="304 Not Modified">Section 4.1</a> of <a href="#Part4" id="rfc.xref.Part4.7"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td id="status.304" class="left"><a href="p4-conditional.html#status.304" title="304 Not Modified">Section 4.1</a> of <a href="#Part4" id="rfc.xref.Part4.8"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
@@ -1563 +1561 @@
                   <td class="left">412</td>
                   <td class="left">Precondition Failed</td>
-                  <td id="status.412" class="left"><a href="p4-conditional.html#status.412" title="412 Precondition Failed">Section 4.2</a> of <a href="#Part4" id="rfc.xref.Part4.8"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td id="status.412" class="left"><a href="p4-conditional.html#status.412" title="412 Precondition Failed">Section 4.2</a> of <a href="#Part4" id="rfc.xref.Part4.9"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
@@ -1583 +1581 @@
                   <td class="left">416</td>
                   <td class="left">Requested range not satisfiable</td>
-                  <td id="status.416" class="left"><a href="p5-range.html#status.416" title="416 Requested Range Not Satisfiable">Section 3.2</a> of <a href="#Part5" id="rfc.xref.Part5.7"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td id="status.416" class="left"><a href="p5-range.html#status.416" title="416 Requested Range Not Satisfiable">Section 3.2</a> of <a href="#Part5" id="rfc.xref.Part5.9"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
                <tr>
@@ -1714 +1712 @@
       </p>
       <p id="rfc.section.4.4.2.p.4">A 201 response <em class="bcp14">MAY</em> contain an ETag response header field indicating the current value of the entity-tag for the representation of the resource
-         identified by the Location header field or, in case the Location header field was omitted, by the Effective Request URI (see <a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.9"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>).
+         identified by the Location header field or, in case the Location header field was omitted, by the Effective Request URI (see <a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.10"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>).
       </p>
       <div id="rfc.iref.27"></div>
@@ -1794 +1792 @@
          <li>
             <p>Other kinds of redirection, such as to a cached result (status code <a href="p4-conditional.html#status.304" class="smpl">304
-                  (Not Modified)</a>, see <a href="p4-conditional.html#status.304" title="304 Not Modified">Section 4.1</a> of <a href="#Part4" id="rfc.xref.Part4.10"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>).
+                  (Not Modified)</a>, see <a href="p4-conditional.html#status.304" title="304 Not Modified">Section 4.1</a> of <a href="#Part4" id="rfc.xref.Part4.11"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a>).
             </p>
          </li>
@@ -2351 +2349 @@
                <tr>
                   <td class="left">Content-Range</td>
-                  <td class="left"><a href="p5-range.html#header.content-range" title="Content-Range">Section 5.2</a> of <a href="#Part5" id="rfc.xref.Part5.8"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
+                  <td class="left"><a href="p5-range.html#header.content-range" title="Content-Range">Section 5.2</a> of <a href="#Part5" id="rfc.xref.Part5.10"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a></td>
                </tr>
             </tbody>
@@ -2457 +2455 @@
                <tr>
                   <td class="left">ETag</td>
-                  <td class="left"><a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.11"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.etag" title="ETag">Section 2.3</a> of <a href="#Part4" id="rfc.xref.Part4.12"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
                <tr>
                   <td class="left">Last-Modified</td>
-                  <td class="left"><a href="p4-conditional.html#header.last-modified" title="Last-Modified">Section 2.2</a> of <a href="#Part4" id="rfc.xref.Part4.12"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
+                  <td class="left"><a href="p4-conditional.html#header.last-modified" title="Last-Modified">Section 2.2</a> of <a href="#Part4" id="rfc.xref.Part4.13"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a></td>
                </tr>
             </tbody>
@@ -3959 +3957 @@
       <p id="rfc.section.C.p.1">Clarify definition of POST. (<a href="#POST" id="rfc.xref.POST.2" title="POST">Section&nbsp;2.3.4</a>)
       </p>
-      <p id="rfc.section.C.p.2">Remove requirement to handle all Content-* header fields; ban use of Content-Range with PUT. (<a href="#PUT" id="rfc.xref.PUT.2" title="PUT">Section&nbsp;2.3.5</a>)
+      <p id="rfc.section.C.p.2">Remove requirement to handle all Content-* header fields; ban use of <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a> with PUT. (<a href="#PUT" id="rfc.xref.PUT.2" title="PUT">Section&nbsp;2.3.5</a>)
       </p>
       <p id="rfc.section.C.p.3">Take over definition of CONNECT method from <a href="#RFC2817" id="rfc.xref.RFC2817.2"><cite title="Upgrading to TLS Within HTTP/1.1">[RFC2817]</cite></a>. (<a href="#CONNECT" id="rfc.xref.CONNECT.2" title="CONNECT">Section&nbsp;2.3.8</a>)
@@ -4204 +4202 @@
       <p id="rfc.section.E.2.p.2">Other changes: </p>
       <ul>
-         <li>Move definitions of 304 and 412 condition codes to <a href="#Part4" id="rfc.xref.Part4.13"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a> 
+         <li>Move definitions of 304 and 412 condition codes to <a href="#Part4" id="rfc.xref.Part4.14"><cite title="HTTP/1.1, part 4: Conditional Requests">[Part4]</cite></a> 
          </li>
       </ul>
@@ -5002 +5000 @@
                      </ul>
                   </li>
-                  <li><em>Part4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.1">3.2</a>, <a href="#rfc.xref.Part4.2">3.2</a>, <a href="#rfc.xref.Part4.3">3.2</a>, <a href="#rfc.xref.Part4.4">3.2</a>, <a href="#rfc.xref.Part4.5">3.3</a>, <a href="#rfc.xref.Part4.6">4.1</a>, <a href="#rfc.xref.Part4.7">4.1</a>, <a href="#rfc.xref.Part4.8">4.1</a>, <a href="#rfc.xref.Part4.9">4.4.2</a>, <a href="#rfc.xref.Part4.10">4.5</a>, <a href="#rfc.xref.Part4.11">7.2</a>, <a href="#rfc.xref.Part4.12">7.2</a>, <a href="#Part4"><b>13.1</b></a>, <a href="#rfc.xref.Part4.13">E.2</a><ul>
-                        <li><em>Section 2.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.12">7.2</a></li>
-                        <li><em>Section 2.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.5">3.3</a>, <a href="#rfc.xref.Part4.9">4.4.2</a>, <a href="#rfc.xref.Part4.11">7.2</a></li>
-                        <li><em>Section 3.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.1">3.2</a></li>
-                        <li><em>Section 3.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.3">3.2</a></li>
-                        <li><em>Section 3.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.2">3.2</a></li>
-                        <li><em>Section 3.4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.4">3.2</a></li>
-                        <li><em>Section 4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.6">4.1</a></li>
-                        <li><em>Section 4.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.7">4.1</a>, <a href="#rfc.xref.Part4.10">4.5</a></li>
-                        <li><em>Section 4.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.8">4.1</a></li>
+                  <li><em>Part4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.1">2.3.2</a>, <a href="#rfc.xref.Part4.2">3.2</a>, <a href="#rfc.xref.Part4.3">3.2</a>, <a href="#rfc.xref.Part4.4">3.2</a>, <a href="#rfc.xref.Part4.5">3.2</a>, <a href="#rfc.xref.Part4.6">3.3</a>, <a href="#rfc.xref.Part4.7">4.1</a>, <a href="#rfc.xref.Part4.8">4.1</a>, <a href="#rfc.xref.Part4.9">4.1</a>, <a href="#rfc.xref.Part4.10">4.4.2</a>, <a href="#rfc.xref.Part4.11">4.5</a>, <a href="#rfc.xref.Part4.12">7.2</a>, <a href="#rfc.xref.Part4.13">7.2</a>, <a href="#Part4"><b>13.1</b></a>, <a href="#rfc.xref.Part4.14">E.2</a><ul>
+                        <li><em>Section 2.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.13">7.2</a></li>
+                        <li><em>Section 2.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.6">3.3</a>, <a href="#rfc.xref.Part4.10">4.4.2</a>, <a href="#rfc.xref.Part4.12">7.2</a></li>
+                        <li><em>Section 3.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.2">3.2</a></li>
+                        <li><em>Section 3.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.4">3.2</a></li>
+                        <li><em>Section 3.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.3">3.2</a></li>
+                        <li><em>Section 3.4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.5">3.2</a></li>
+                        <li><em>Section 4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.7">4.1</a></li>
+                        <li><em>Section 4.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.8">4.1</a>, <a href="#rfc.xref.Part4.11">4.5</a></li>
+                        <li><em>Section 4.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part4.9">4.1</a></li>
                      </ul>
                   </li>
-                  <li><em>Part5</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.1">2.3.2</a>, <a href="#rfc.xref.Part5.2">3.2</a>, <a href="#rfc.xref.Part5.3">3.2</a>, <a href="#rfc.xref.Part5.4">3.3</a>, <a href="#rfc.xref.Part5.5">4.1</a>, <a href="#rfc.xref.Part5.6">4.1</a>, <a href="#rfc.xref.Part5.7">4.1</a>, <a href="#rfc.xref.Part5.8">6.1</a>, <a href="#Part5"><b>13.1</b></a><ul>
-                        <li><em>Section 3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.5">4.1</a></li>
-                        <li><em>Section 3.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.6">4.1</a></li>
-                        <li><em>Section 3.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.7">4.1</a></li>
-                        <li><em>Section 5.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.4">3.3</a></li>
-                        <li><em>Section 5.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.8">6.1</a></li>
-                        <li><em>Section 5.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.2">3.2</a></li>
-                        <li><em>Section 5.4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.1">2.3.2</a>, <a href="#rfc.xref.Part5.3">3.2</a></li>
+                  <li><em>Part5</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.1">2.3.2</a>, <a href="#rfc.xref.Part5.2">2.3.2</a>, <a href="#rfc.xref.Part5.3">2.3.5</a>, <a href="#rfc.xref.Part5.4">3.2</a>, <a href="#rfc.xref.Part5.5">3.2</a>, <a href="#rfc.xref.Part5.6">3.3</a>, <a href="#rfc.xref.Part5.7">4.1</a>, <a href="#rfc.xref.Part5.8">4.1</a>, <a href="#rfc.xref.Part5.9">4.1</a>, <a href="#rfc.xref.Part5.10">6.1</a>, <a href="#Part5"><b>13.1</b></a><ul>
+                        <li><em>Section 3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.7">4.1</a></li>
+                        <li><em>Section 3.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.8">4.1</a></li>
+                        <li><em>Section 3.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.9">4.1</a></li>
+                        <li><em>Section 5.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.6">3.3</a></li>
+                        <li><em>Section 5.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.3">2.3.5</a>, <a href="#rfc.xref.Part5.10">6.1</a></li>
+                        <li><em>Section 5.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.4">3.2</a></li>
+                        <li><em>Section 5.4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part5.2">2.3.2</a>, <a href="#rfc.xref.Part5.5">3.2</a></li>
                      </ul>
                   </li>

draft-ietf-httpbis/latest/p2-semantics.xml

@@ -581 +581 @@
    The semantics of the GET method change to a "conditional GET" if the
    request message includes an If-Modified-Since, If-Unmodified-Since,
-   If-Match, If-None-Match, or If-Range header field. A conditional GET
-   requests that the representation be transferred only under the
-   circumstances described by the conditional header field(s). The
-   conditional GET request is intended to reduce unnecessary network
-   usage by allowing cached representations to be refreshed without requiring
-   multiple requests or transferring data already held by the client.
-</t>
-<t>
-   The semantics of the GET method change to a "partial GET" if the
-   request message includes a Range header field. A partial GET requests
-   that only part of the representation be transferred, as described in &header-range;.
-   The partial GET request is intended to reduce unnecessary
-   network usage by allowing partially-retrieved representations to be
-   completed without transferring data already held by the client.
+   If-Match, If-None-Match, or <x:ref>If-Range</x:ref> header field
+   (<xref target="Part4"/>). A conditional GET requests that the representation
+   be transferred only under the circumstances described by the conditional
+   header field(s). The conditional GET request is intended to reduce
+   unnecessary network usage by allowing cached representations to be refreshed
+   without requiring multiple requests or transferring data already held by the
+   client.
+</t>
+<t>
+   The semantics of the GET method change to a "partial GET" if the request
+   message includes a <x:ref>Range</x:ref> header field (<xref target="Part5"/>).
+   A partial GET requests that only part of the representation be transferred,
+   as described in &header-range;. The partial GET request is intended to reduce
+   unnecessary network usage by allowing partially-retrieved representations to
+   be completed without transferring data already held by the client.
 </t>
 <t>
@@ -803 +804 @@
 <t>
    An origin server &SHOULD; reject any PUT request that contains a
-   Content-Range header field, since it might be misinterpreted as
-   partial content (or might be partial content that is being mistakenly
-   PUT as a full representation).  Partial content updates are
-   possible by targeting a separately identified resource with state
-   that overlaps a portion of the larger resource, or by using a
+   <x:ref>Content-Range</x:ref> header field (&header-content-range;), since
+   it might be misinterpreted as partial content (or might be partial content
+   that is being mistakenly PUT as a full representation).  Partial content
+   updates are possible by targeting a separately identified resource with
+   state that overlaps a portion of the larger resource, or by using a
    different method that has been specifically defined for partial
    updates (for example, the PATCH method defined in
@@ -4672 +4673 @@
     <x:defines>206</x:defines>
     <x:defines>206 (Partial Content)</x:defines>
+    <x:defines>Content-Range</x:defines>
+    <x:defines>If-Range</x:defines>
+    <x:defines>Range</x:defines>
   </x:source>
 </reference>
@@ -5458 +5462 @@
 <t>
   Remove requirement to handle all Content-* header fields; ban use of
-  Content-Range with PUT.
+  <x:ref>Content-Range</x:ref> with PUT.
   (<xref target="PUT"/>)
 </t>

draft-ietf-httpbis/latest/p4-conditional.html

@@ -770 +770 @@
       <ul>
          <li>The validator is about to be used by a client in an If-Modified-Since, If-Unmodified-Since header field, because the client
-            has a cache entry, or If-Range for the associated representation, and
+            has a cache entry, or <a href="p5-range.html#header.if-range" class="smpl">If-Range</a> for the associated representation, and
          </li>
          <li>That cache entry includes a Date value, which gives the time when the origin server sent the original response, and</li>
@@ -954 +954 @@
       </ul>
       <p id="rfc.section.2.4.p.5">An HTTP/1.1 origin server, upon receiving a conditional request that includes both a Last-Modified date (e.g., in an If-Modified-Since
-         or If-Unmodified-Since header field) and one or more entity-tags (e.g., in an If-Match, If-None-Match, or If-Range header
-         field) as cache validators, <em class="bcp14">MUST NOT</em> return a response status code of <a href="#status.304" class="smpl">304 (Not Modified)</a> unless doing so is consistent with all of the conditional header fields in the request.
+         or If-Unmodified-Since header field) and one or more entity-tags (e.g., in an If-Match, If-None-Match, or <a href="p5-range.html#header.if-range" class="smpl">If-Range</a> header field) as cache validators, <em class="bcp14">MUST NOT</em> return a response status code of <a href="#status.304" class="smpl">304 (Not Modified)</a> unless doing so is consistent with all of the conditional header fields in the request.
       </p>
       <p id="rfc.section.2.4.p.6">An HTTP/1.1 caching proxy, upon receiving a conditional request that includes both a Last-Modified date and one or more entity-tags
@@ -1042 +1041 @@
 </pre><p id="rfc.section.3.3.p.3">An example of the field is:</p>
       <div id="rfc.figure.u.14"></div><pre class="text">  If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
-</pre><p id="rfc.section.3.3.p.5">A GET method with an If-Modified-Since header field and no Range header field requests that the selected representation be
-         transferred only if it has been modified since the date given by the If-Modified-Since header field. The algorithm for determining
-         this includes the following cases: 
+</pre><p id="rfc.section.3.3.p.5">A GET method with an If-Modified-Since header field and no <a href="p5-range.html#range.retrieval.requests" class="smpl">Range</a> header field requests that the selected representation be transferred only if it has been modified since the date given by
+         the If-Modified-Since header field. The algorithm for determining this includes the following cases: 
       </p>
       <ol>
@@ -1058 +1056 @@
       <p id="rfc.section.3.3.p.6">The purpose of this feature is to allow efficient updates of cached information with a minimum amount of transaction overhead. </p>
       <ul class="empty">
-         <li> <b>Note:</b> The Range header field modifies the meaning of If-Modified-Since; see <a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.1"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a> for full details.
+         <li> <b>Note:</b> The <a href="p5-range.html#range.retrieval.requests" class="smpl">Range</a> header field modifies the meaning of If-Modified-Since; see <a href="p5-range.html#header.range" title="Range">Section 5.4</a> of <a href="#Part5" id="rfc.xref.Part5.1"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a> for full details.
          </li>
          <li> <b>Note:</b> If-Modified-Since times are interpreted by the server, whose clock might not be synchronized with the client.
@@ -1095 +1093 @@
       </p>
       <h2 id="rfc.section.3.5"><a href="#rfc.section.3.5">3.5</a>&nbsp;<a id="header.if-range" href="#header.if-range">If-Range</a></h2>
-      <p id="rfc.section.3.5.p.1">The If-Range header field provides a special conditional request mechanism that is similar to If-Match and If-Unmodified-Since
+      <p id="rfc.section.3.5.p.1">The "If-Range" header field provides a special conditional request mechanism that is similar to If-Match and If-Unmodified-Since
          but specific to HTTP range requests. If-Range is defined in <a href="p5-range.html#header.if-range" title="If-Range">Section 5.3</a> of <a href="#Part5" id="rfc.xref.Part5.2"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>.
       </p>

draft-ietf-httpbis/latest/p4-conditional.xml

@@ -424 +424 @@
      <t>The validator is about to be used by a client in an If-Modified-Since,
         If-Unmodified-Since header field, because the client has a cache entry,
-        or If-Range for the associated representation, and</t>
+        or <x:ref>If-Range</x:ref> for the associated representation, and</t>
      <t>That cache entry includes a Date value, which gives the time
         when the origin server sent the original response, and</t>
@@ -696 +696 @@
    includes both a Last-Modified date (e.g., in an If-Modified-Since or
    If-Unmodified-Since header field) and one or more entity-tags (e.g.,
-   in an If-Match, If-None-Match, or If-Range header field) as cache
-   validators, &MUST-NOT; return a response status code of <x:ref>304 (Not Modified)</x:ref>
-   unless doing so is consistent with all of the conditional header
-   fields in the request.
+   in an If-Match, If-None-Match, or <x:ref>If-Range</x:ref> header field) as
+   cache validators, &MUST-NOT; return a response status code of
+   <x:ref>304 (Not Modified)</x:ref> unless doing so is consistent with all of
+   the conditional header fields in the request.
 </t>
 <t>
@@ -879 +879 @@
 </artwork></figure>
 <t>
-   A GET method with an If-Modified-Since header field and no Range header
-   field requests that the selected representation be transferred only if
+   A GET method with an If-Modified-Since header field and no <x:ref>Range</x:ref>
+   header field requests that the selected representation be transferred only if
    it has been modified since the date given by the If-Modified-Since
    header field.
@@ -904 +904 @@
    information with a minimum amount of transaction overhead.
   <list><t>
-      &Note; The Range header field modifies the meaning of If-Modified-Since;
-      see &header-range; for full details.
+      &Note; The <x:ref>Range</x:ref> header field modifies the meaning of
+      If-Modified-Since; see &header-range; for full details.
     </t><t>
       &Note; If-Modified-Since times are interpreted by the server, whose
@@ -983 +983 @@
 <section title="If-Range" anchor="header.if-range">
 <t>
-   The If-Range header field provides a special conditional request
+   The "If-Range" header field provides a special conditional request
    mechanism that is similar to If-Match and If-Unmodified-Since but
    specific to HTTP range requests. If-Range is defined in &header-if-range;.
@@ -1224 +1224 @@
   </front>
   <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-p5-range-&ID-VERSION;"/>
-  <x:source href="p5-range.xml" basename="p5-range"/>
+  <x:source href="p5-range.xml" basename="p5-range">
+    <x:defines>If-Range</x:defines>
+    <x:defines>Range</x:defines>
+  </x:source>
 </reference>
 

draft-ietf-httpbis/latest/p5-range.html

@@ -706 +706 @@
 </pre><h1 id="rfc.section.2"><a href="#rfc.section.2">2.</a>&nbsp;<a id="range.units" href="#range.units">Range Units</a></h1>
       <p id="rfc.section.2.p.1">HTTP/1.1 allows a client to request that only part (a range) of the representation be included within the response. HTTP/1.1
-         uses range units in the Range (<a href="#header.range" id="rfc.xref.header.range.1" title="Range">Section&nbsp;5.4</a>) and Content-Range (<a href="#header.content-range" id="rfc.xref.header.content-range.1" title="Content-Range">Section&nbsp;5.2</a>) header fields. A representation can be broken down into subranges according to various structural units.
+         uses range units in the <a href="#range.retrieval.requests" class="smpl">Range</a> (<a href="#header.range" id="rfc.xref.header.range.1" title="Range">Section&nbsp;5.4</a>) and <a href="#header.content-range" class="smpl">Content-Range</a> (<a href="#header.content-range" id="rfc.xref.header.content-range.1" title="Content-Range">Section&nbsp;5.2</a>) header fields. A representation can be broken down into subranges according to various structural units.
       </p>
       <div id="rfc.figure.u.3"></div><pre class="inline"><span id="rfc.iref.g.1"></span><span id="rfc.iref.g.2"></span><span id="rfc.iref.g.3"></span>  <a href="#range.units" class="smpl">range-unit</a>       = <a href="#range.units" class="smpl">bytes-unit</a> / <a href="#range.units" class="smpl">other-range-unit</a>
@@ -714 +714 @@
          unit defined by HTTP/1.1 is "bytes". Additional specifiers can be defined as described in <a href="#range.specifier.registry" title="Range Specifier Registry">Section&nbsp;2.1</a>.
       </p>
-      <p id="rfc.section.2.p.4">If a range unit is not understood in a request, a server <em class="bcp14">MUST</em> ignore the whole Range header field (<a href="#header.range" id="rfc.xref.header.range.2" title="Range">Section&nbsp;5.4</a>). If a range unit is not understood in a response, an intermediary <em class="bcp14">SHOULD</em> pass the response to the client; a client <em class="bcp14">MUST</em> fail.
+      <p id="rfc.section.2.p.4">If a range unit is not understood in a request, a server <em class="bcp14">MUST</em> ignore the whole <a href="#range.retrieval.requests" class="smpl">Range</a> header field (<a href="#header.range" id="rfc.xref.header.range.2" title="Range">Section&nbsp;5.4</a>). If a range unit is not understood in a response, an intermediary <em class="bcp14">SHOULD</em> pass the response to the client; a client <em class="bcp14">MUST</em> fail.
       </p>
       <h2 id="rfc.section.2.1"><a href="#rfc.section.2.1">2.1</a>&nbsp;<a id="range.specifier.registry" href="#range.specifier.registry">Range Specifier Registry</a></h2>
@@ -733 +733 @@
       <div id="rfc.iref.s.1"></div>
       <h2 id="rfc.section.3.1"><a href="#rfc.section.3.1">3.1</a>&nbsp;<a id="status.206" href="#status.206">206 Partial Content</a></h2>
-      <p id="rfc.section.3.1.p.1">The server has fulfilled the partial GET request for the resource. The request <em class="bcp14">MUST</em> have included a Range header field (<a href="#header.range" id="rfc.xref.header.range.3" title="Range">Section&nbsp;5.4</a>) indicating the desired range, and <em class="bcp14">MAY</em> have included an If-Range header field (<a href="#header.if-range" id="rfc.xref.header.if-range.1" title="If-Range">Section&nbsp;5.3</a>) to make the request conditional.
+      <p id="rfc.section.3.1.p.1">The server has fulfilled the partial GET request for the resource. The request <em class="bcp14">MUST</em> have included a <a href="#range.retrieval.requests" class="smpl">Range</a> header field (<a href="#header.range" id="rfc.xref.header.range.3" title="Range">Section&nbsp;5.4</a>) indicating the desired range, and <em class="bcp14">MAY</em> have included an <a href="#header.if-range" class="smpl">If-Range</a> header field (<a href="#header.if-range" id="rfc.xref.header.if-range.1" title="If-Range">Section&nbsp;5.3</a>) to make the request conditional.
       </p>
       <p id="rfc.section.3.1.p.2">The response <em class="bcp14">MUST</em> include the following header fields: 
       </p>
       <ul>
-         <li>Either a Content-Range header field (<a href="#header.content-range" id="rfc.xref.header.content-range.2" title="Content-Range">Section&nbsp;5.2</a>) indicating the range included with this response, or a multipart/byteranges Content-Type including Content-Range fields
+         <li>Either a <a href="#header.content-range" class="smpl">Content-Range</a> header field (<a href="#header.content-range" id="rfc.xref.header.content-range.2" title="Content-Range">Section&nbsp;5.2</a>) indicating the range included with this response, or a multipart/byteranges Content-Type including Content-Range fields
             for each part. If a Content-Length header field is present in the response, its value <em class="bcp14">MUST</em> match the actual number of octets transmitted in the message body.
          </li>
@@ -745 +745 @@
          </li>
       </ul>
-      <p id="rfc.section.3.1.p.3">If a 206 is sent in response to a request with an If-Range header field, it <em class="bcp14">SHOULD NOT</em> include other representation header fields. Otherwise, the response <em class="bcp14">MUST</em> include all of the representation header fields that would have been returned with a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response to the same request.
+      <p id="rfc.section.3.1.p.3">If a 206 is sent in response to a request with an <a href="#header.if-range" class="smpl">If-Range</a> header field, it <em class="bcp14">SHOULD NOT</em> include other representation header fields. Otherwise, the response <em class="bcp14">MUST</em> include all of the representation header fields that would have been returned with a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response to the same request.
       </p>
       <p id="rfc.section.3.1.p.4">Caches <em class="bcp14">MAY</em> use a heuristic (see <a href="p6-cache.html#heuristic.freshness" title="Calculating Heuristic Freshness">Section 2.3.1.1</a> of <a href="#Part6" id="rfc.xref.Part6.1"><cite title="HTTP/1.1, part 6: Caching">[Part6]</cite></a>) to determine freshness for 206 responses.
@@ -752 +752 @@
       <div id="rfc.iref.s.2"></div>
       <h2 id="rfc.section.3.2"><a href="#rfc.section.3.2">3.2</a>&nbsp;<a id="status.416" href="#status.416">416 Requested Range Not Satisfiable</a></h2>
-      <p id="rfc.section.3.2.p.1">A server <em class="bcp14">SHOULD</em> return a response with this status code if a request included a Range header field (<a href="#header.range" id="rfc.xref.header.range.4" title="Range">Section&nbsp;5.4</a>), and none of the ranges-specifier values in this field overlap the current extent of the selected resource, and the request
-         did not include an If-Range header field (<a href="#header.if-range" id="rfc.xref.header.if-range.2" title="If-Range">Section&nbsp;5.3</a>). (For byte-ranges, this means that the first-byte-pos of all of the byte-range-spec values were greater than the current
+      <p id="rfc.section.3.2.p.1">A server <em class="bcp14">SHOULD</em> return a response with this status code if a request included a <a href="#range.retrieval.requests" class="smpl">Range</a> header field (<a href="#header.range" id="rfc.xref.header.range.4" title="Range">Section&nbsp;5.4</a>), and none of the ranges-specifier values in this field overlap the current extent of the selected resource, and the request
+         did not include an <a href="#header.if-range" class="smpl">If-Range</a> header field (<a href="#header.if-range" id="rfc.xref.header.if-range.2" title="If-Range">Section&nbsp;5.3</a>). (For byte-ranges, this means that the first-byte-pos of all of the byte-range-spec values were greater than the current
          length of the selected resource.)
       </p>
-      <p id="rfc.section.3.2.p.2">When this status code is returned for a byte-range request, the response <em class="bcp14">SHOULD</em> include a Content-Range header field specifying the current length of the representation (see <a href="#header.content-range" id="rfc.xref.header.content-range.3" title="Content-Range">Section&nbsp;5.2</a>). This response <em class="bcp14">MUST NOT</em> use the multipart/byteranges content-type. For example,
+      <p id="rfc.section.3.2.p.2">When this status code is returned for a byte-range request, the response <em class="bcp14">SHOULD</em> include a <a href="#header.content-range" class="smpl">Content-Range</a> header field specifying the current length of the representation (see <a href="#header.content-range" id="rfc.xref.header.content-range.3" title="Content-Range">Section&nbsp;5.2</a>). This response <em class="bcp14">MUST NOT</em> use the multipart/byteranges content-type. For example,
       </p>
       <div id="rfc.figure.u.4"></div><pre class="text">HTTP/1.1 416 Requested Range Not Satisfiable
@@ -764 +764 @@
 </pre><div class="note" id="rfc.section.3.2.p.4"> 
          <p> <b>Note:</b> Clients cannot depend on servers to send a <a href="#status.416" class="smpl">416 (Requested
-               Range Not Satisfiable)</a> response instead of a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response for an unsatisfiable Range header field, since not all servers implement this header field.
+               Range Not Satisfiable)</a> response instead of a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response for an unsatisfiable <a href="#range.retrieval.requests" class="smpl">Range</a> header field, since not all servers implement this header field.
          </p> 
       </div>
@@ -772 +772 @@
       </h2>
       <p id="rfc.section.4.1.p.1">When an HTTP message includes the content of a single range (for example, a response to a request for a single range, or to
-         a request for a set of ranges that overlap without any holes), this content is transmitted with a Content-Range header field,
-         and a Content-Length header field showing the number of bytes actually transferred. For example,
+         a request for a set of ranges that overlap without any holes), this content is transmitted with a <a href="#header.content-range" class="smpl">Content-Range</a> header field, and a Content-Length header field showing the number of bytes actually transferred. For example,
       </p>
       <div id="rfc.figure.u.5"></div><pre class="text">HTTP/1.1 206 Partial Content
@@ -806 +805 @@
       <p id="rfc.section.4.2.p.4">If the new response is a <a href="#status.206" class="smpl">206 (Partial Content)</a> response and at least one of the matching stored responses is a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a>, then the combined response header fields consist of the most recent 200 response's header fields. If all of the matching
          stored responses are 206 responses, then the stored response with the most header fields is used as the source of header fields
-         for the combined response, except that the client <em class="bcp14">MUST</em> use other header fields provided in the new response, aside from Content-Range, to replace all instances of the corresponding
-         header fields in the stored response.
+         for the combined response, except that the client <em class="bcp14">MUST</em> use other header fields provided in the new response, aside from <a href="#header.content-range" class="smpl">Content-Range</a>, to replace all instances of the corresponding header fields in the stored response.
       </p>
       <p id="rfc.section.4.2.p.5">The combined response message body consists of the union of partial content ranges in the new response and each of the selected
-         responses. If the union consists of the entire range of the representation, then the combined response <em class="bcp14">MUST</em> be recorded as a complete <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response with a Content-Length header field that reflects the complete length. Otherwise, the combined response(s) <em class="bcp14">MUST</em> include a Content-Range header field describing the included range(s) and be recorded as incomplete. If the union consists
-         of a discontinuous range of the representation, then the client <em class="bcp14">MAY</em> store it as either a multipart range response or as multiple <a href="#status.206" class="smpl">206</a> responses with one continuous range each.
+         responses. If the union consists of the entire range of the representation, then the combined response <em class="bcp14">MUST</em> be recorded as a complete <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response with a Content-Length header field that reflects the complete length. Otherwise, the combined response(s) <em class="bcp14">MUST</em> include a <a href="#header.content-range" class="smpl">Content-Range</a> header field describing the included range(s) and be recorded as incomplete. If the union consists of a discontinuous range
+         of the representation, then the client <em class="bcp14">MAY</em> store it as either a multipart range response or as multiple <a href="#status.206" class="smpl">206</a> responses with one continuous range each.
       </p>
       <h1 id="rfc.section.5"><a href="#rfc.section.5">5.</a>&nbsp;<a id="header.field.definitions" href="#header.field.definitions">Header Field Definitions</a></h1>
@@ -884 +882 @@
       </ul>
       <p id="rfc.section.5.2.p.10">If the server ignores a byte-range-spec (for example if it is syntactically invalid, or if it might be seen as a denial-of-service
-         attack), the server <em class="bcp14">SHOULD</em> treat the request as if the invalid Range header field did not exist. (Normally, this means return a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response containing the full representation).
+         attack), the server <em class="bcp14">SHOULD</em> treat the request as if the invalid <a href="#range.retrieval.requests" class="smpl">Range</a> header field did not exist. (Normally, this means return a <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> response containing the full representation).
       </p>
       <div id="rfc.iref.i.1"></div>
@@ -890 +888 @@
       <h2 id="rfc.section.5.3"><a href="#rfc.section.5.3">5.3</a>&nbsp;<a id="header.if-range" href="#header.if-range">If-Range</a></h2>
       <p id="rfc.section.5.3.p.1">If a client has a partial copy of a representation and wishes to have an up-to-date copy of the entire representation, it
-         could use the Range header field with a conditional GET (using either or both of If-Unmodified-Since and If-Match.) However,
-         if the condition fails because the representation has been modified, the client would then have to make a second request to
-         obtain the entire current representation.
+         could use the <a href="#range.retrieval.requests" class="smpl">Range</a> header field with a conditional GET (using either or both of If-Unmodified-Since and If-Match.) However, if the condition
+         fails because the representation has been modified, the client would then have to make a second request to obtain the entire
+         current representation.
       </p>
       <p id="rfc.section.5.3.p.2">The "If-Range" header field allows a client to "short-circuit" the second request. Informally, its meaning is "if the representation
@@ -1196 +1194 @@
          </p> 
       </div>
-      <p id="rfc.section.A.p.3">The multipart/byteranges media type includes one or more parts, each with its own Content-Type and Content-Range fields. The
-         required boundary parameter specifies the boundary string used to separate each body-part.
+      <p id="rfc.section.A.p.3">The multipart/byteranges media type includes one or more parts, each with its own Content-Type and <a href="#header.content-range" class="smpl">Content-Range</a> fields. The required boundary parameter specifies the boundary string used to separate each body-part.
       </p>
       <p id="rfc.section.A.p.4"> </p>

draft-ietf-httpbis/latest/p5-range.xml

@@ -261 +261 @@
    HTTP/1.1 allows a client to request that only part (a range) of the
    representation be included within the response. HTTP/1.1 uses range
-   units in the Range (<xref target="header.range"/>) and Content-Range (<xref target="header.content-range"/>)
+   units in the <x:ref>Range</x:ref> (<xref target="header.range"/>) and
+   <x:ref>Content-Range</x:ref> (<xref target="header.content-range"/>)
    header fields. A representation can be broken down into subranges according
    to various structural units.
@@ -278 +279 @@
 <t>
   If a range unit is not understood in a request, a server &MUST; ignore
-  the whole Range header field (<xref target="header.range"/>).
+  the whole <x:ref>Range</x:ref> header field (<xref target="header.range"/>).
   If a range unit is not understood in a response, an intermediary 
   &SHOULD; pass the response to the client; a client &MUST; fail.
@@ -316 +317 @@
 <t>
    The server has fulfilled the partial GET request for the resource.
-   The request &MUST; have included a Range header field (<xref target="header.range"/>)
-   indicating the desired range, and &MAY; have included an If-Range
-   header field (<xref target="header.if-range"/>) to make the request conditional.
+   The request &MUST; have included a <x:ref>Range</x:ref> header field
+   (<xref target="header.range"/>) indicating the desired range, and &MAY; have
+   included an <x:ref>If-Range</x:ref> header field
+   (<xref target="header.if-range"/>) to make the request conditional.
 </t>
 <t>
@@ -324 +326 @@
   <list style="symbols">
     <t>
-        Either a Content-Range header field (<xref target="header.content-range"/>) indicating
+        Either a <x:ref>Content-Range</x:ref> header field
+        (<xref target="header.content-range"/>) indicating
         the range included with this response, or a multipart/byteranges
         Content-Type including Content-Range fields for each part. If a
@@ -342 +345 @@
 </t>
 <t>
-   If a 206 is sent in response to a request with an If-Range header field, it
-   &SHOULD-NOT; include other representation header fields. Otherwise, the response
-   &MUST; include all of the representation header fields that would have been returned
-   with a <x:ref>200 (OK)</x:ref> response to the same request.
+   If a 206 is sent in response to a request with an <x:ref>If-Range</x:ref>
+   header field, it &SHOULD-NOT; include other representation header fields.
+   Otherwise, the response &MUST; include all of the representation header
+   fields that would have been returned with a <x:ref>200 (OK)</x:ref> response
+   to the same request.
 </t>
 <t>
@@ -359 +363 @@
 <t>
    A server &SHOULD; return a response with this status code if a request
-   included a Range header field (<xref target="header.range"/>), and none of
-   the ranges-specifier values in this field overlap the current extent
-   of the selected resource, and the request did not include an If-Range
-   header field (<xref target="header.if-range"/>). (For byte-ranges,
-   this means that the first-byte-pos of all of the byte-range-spec values were
-   greater than the current length of the selected resource.)
+   included a <x:ref>Range</x:ref> header field (<xref target="header.range"/>),
+   and none of the ranges-specifier values in this field overlap the current
+   extent of the selected resource, and the request did not include an
+   <x:ref>If-Range</x:ref> header field (<xref target="header.if-range"/>).
+   (For byte-ranges, this means that the first-byte-pos of all of the
+   byte-range-spec values were greater than the current length of the selected
+   resource.)
 </t>
 <t>
    When this status code is returned for a byte-range request, the
-   response &SHOULD; include a Content-Range header field
+   response &SHOULD; include a <x:ref>Content-Range</x:ref> header field
    specifying the current length of the representation (see <xref target="header.content-range"/>).
    This response &MUST-NOT; use the multipart/byteranges content-type. For example,
@@ -382 +387 @@
     &Note; Clients cannot depend on servers to send a <x:ref>416 (Requested
     Range Not Satisfiable)</x:ref> response instead of a <x:ref>200 (OK)</x:ref>
-    response for an unsatisfiable Range header field, since not all servers
-    implement this header field.
+    response for an unsatisfiable <x:ref>Range</x:ref> header field, since not
+    all servers implement this header field.
   </t>
 </x:note>
@@ -395 +400 @@
    example, a response to a request for a single range, or to a request
    for a set of ranges that overlap without any holes), this content is
-   transmitted with a Content-Range header field, and a Content-Length header
-   field showing the number of bytes actually transferred. For example,
+   transmitted with a <x:ref>Content-Range</x:ref> header field, and a
+   Content-Length header field showing the number of bytes actually transferred.
+   For example,
 </t>
 <figure><artwork type="message/http; msgtype=&#34;response&#34;" x:indent-with="  ">
@@ -466 +472 @@
    header fields for the combined response, except that the client &MUST;
    use other header fields provided in the new response, aside from
-   Content-Range, to replace all instances of the corresponding header
-   fields in the stored response.
+   <x:ref>Content-Range</x:ref>, to replace all instances of the corresponding
+   header fields in the stored response.
 </t>
 <t>
@@ -475 +481 @@
    combined response &MUST; be recorded as a complete <x:ref>200 (OK)</x:ref> response
    with a Content-Length header field that reflects the complete length.
-   Otherwise, the combined response(s) &MUST; include a Content-Range
+   Otherwise, the combined response(s) &MUST; include a <x:ref>Content-Range</x:ref>
    header field describing the included range(s) and be recorded as
    incomplete.  If the union consists of a discontinuous range of the
@@ -626 +632 @@
    If the server ignores a byte-range-spec (for example if it is
    syntactically invalid, or if it might be seen as a denial-of-service
-   attack), the server &SHOULD; treat the request as if the invalid Range
+   attack), the server &SHOULD; treat the request as if the invalid <x:ref>Range</x:ref>
    header field did not exist. (Normally, this means return a <x:ref>200 (OK)</x:ref>
    response containing the full representation).
@@ -638 +644 @@
 <t>
    If a client has a partial copy of a representation and wishes
-   to have an up-to-date copy of the entire representation, it
-   could use the Range header field with a conditional GET (using
+   to have an up-to-date copy of the entire representation, it could use the
+   <x:ref>Range</x:ref> header field with a conditional GET (using
    either or both of If-Unmodified-Since and If-Match.) However, if the
    condition fails because the representation has been modified, the client
@@ -1244 +1250 @@
 <t>
    The multipart/byteranges media type includes one or more parts, each
-   with its own Content-Type and Content-Range fields. The required
-   boundary parameter specifies the boundary string used to separate
+   with its own Content-Type and <x:ref>Content-Range</x:ref> fields. The
+   required boundary parameter specifies the boundary string used to separate
    each body-part.
 </t>

draft-ietf-httpbis/latest/p6-cache.html

@@ -876 +876 @@
          time, as such responses are not usually useful to store. However, caches are not prohibited from storing such responses.
       </p>
-      <p id="rfc.section.2.1.p.5">A response message is considered complete when all of the octets indicated by the message framing (<a href="#Part1" id="rfc.xref.Part1.11"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a>) are received prior to the connection being closed. If the request is GET, the response status is <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a>, and the entire response header block has been received, a cache <em class="bcp14">MAY</em> store an incomplete response message body if the cache entry is recorded as incomplete. Likewise, a <a href="p5-range.html#status.206" class="smpl">206 (Partial Content)</a> response <em class="bcp14">MAY</em> be stored as if it were an incomplete <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> cache entry. However, a cache <em class="bcp14">MUST NOT</em> store incomplete or partial content responses if it does not support the Range and Content-Range header fields or if it does
-         not understand the range units used in those fields.
+      <p id="rfc.section.2.1.p.5">A response message is considered complete when all of the octets indicated by the message framing (<a href="#Part1" id="rfc.xref.Part1.11"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a>) are received prior to the connection being closed. If the request is GET, the response status is <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a>, and the entire response header block has been received, a cache <em class="bcp14">MAY</em> store an incomplete response message body if the cache entry is recorded as incomplete. Likewise, a <a href="p5-range.html#status.206" class="smpl">206 (Partial Content)</a> response <em class="bcp14">MAY</em> be stored as if it were an incomplete <a href="p2-semantics.html#status.200" class="smpl">200 (OK)</a> cache entry. However, a cache <em class="bcp14">MUST NOT</em> store incomplete or partial content responses if it does not support the <a href="p5-range.html#range.retrieval.requests" class="smpl">Range</a> and <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a> header fields or if it does not understand the range units used in those fields.
       </p>
       <p id="rfc.section.2.1.p.6">A cache <em class="bcp14">MAY</em> complete a stored incomplete response by making a subsequent range request (<a href="#Part5" id="rfc.xref.Part5.1"><cite title="HTTP/1.1, part 5: Range Requests and Partial Responses">[Part5]</cite></a>) and combining the successful response with the stored entry, as defined in <a href="#combining.responses" title="Combining Partial Content">Section&nbsp;2.9</a>. A cache <em class="bcp14">MUST NOT</em> use an incomplete response to answer requests unless the response has been made complete or the request is partial and specifies
@@ -1207 +1206 @@
          <li>retain any <a href="#header.warning" class="smpl">Warning</a> header fields in the stored response with warn-code 2xx; and,
          </li>
-         <li>use other header fields provided in the new response, aside from Content-Range, to replace all instances of the corresponding
-            header fields in the stored response.
+         <li>use other header fields provided in the new response, aside from <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a>, to replace all instances of the corresponding header fields in the stored response.
          </li>
       </ul>
@@ -1312 +1310 @@
       <div id="rfc.iref.n.3"></div>
       <h4 id="rfc.section.3.2.1.6"><a href="#rfc.section.3.2.1.6">3.2.1.6</a>&nbsp;<a id="cache-request-directive.no-transform" href="#cache-request-directive.no-transform">no-transform</a></h4>
-      <p id="rfc.section.3.2.1.6.p.1">The no-transform request directive indicates that an intermediary (whether or not it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type request header fields, nor the request representation.
+      <p id="rfc.section.3.2.1.6.p.1">The no-transform request directive indicates that an intermediary (whether or not it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a> or Content-Type request header fields, nor the request representation.
       </p>
       <div id="rfc.iref.c.13"></div>
@@ -1428 +1426 @@
       <div id="rfc.iref.n.6"></div>
       <h4 id="rfc.section.3.2.2.9"><a href="#rfc.section.3.2.2.9">3.2.2.9</a>&nbsp;<a id="cache-response-directive.no-transform" href="#cache-response-directive.no-transform">no-transform</a></h4>
-      <p id="rfc.section.3.2.2.9.p.1">The no-transform response directive indicates that an intermediary (regardless of whether it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type response header fields, nor the response representation.
+      <p id="rfc.section.3.2.2.9.p.1">The no-transform response directive indicates that an intermediary (regardless of whether it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, <a href="p5-range.html#header.content-range" class="smpl">Content-Range</a> or Content-Type response header fields, nor the response representation.
       </p>
       <h3 id="rfc.section.3.2.3"><a href="#rfc.section.3.2.3">3.2.3</a>&nbsp;<a id="cache.control.extensions" href="#cache.control.extensions">Cache Control Extensions</a></h3>

draft-ietf-httpbis/latest/p6-cache.xml

@@ -510 +510 @@
    Likewise, a <x:ref>206 (Partial Content)</x:ref> response &MAY; be stored as if it were
    an incomplete <x:ref>200 (OK)</x:ref> cache entry.  However, a cache &MUST-NOT; store
-   incomplete or partial content responses if it does not support the Range
-   and Content-Range header fields or if it does not understand the
-   range units used in those fields.
+   incomplete or partial content responses if it does not support the
+   <x:ref>Range</x:ref> and <x:ref>Content-Range</x:ref> header fields or if it
+   does not understand the range units used in those fields.
 </t>
 <t>
@@ -1149 +1149 @@
          with warn-code 2xx; and,</t>
       <t>use other header fields provided in the new response, aside
-         from Content-Range, to replace all instances of the corresponding
-         header fields in the stored response.</t>
+         from <x:ref>Content-Range</x:ref>, to replace all instances of the
+         corresponding header fields in the stored response.</t>
    </list>
 </t>
@@ -1358 +1358 @@
    The no-transform request directive indicates that an intermediary
    (whether or not it implements a cache) &MUST-NOT; change the 
-   Content-Encoding, Content-Range or Content-Type request header fields, 
-   nor the request representation.
+   Content-Encoding, <x:ref>Content-Range</x:ref> or Content-Type request
+   header fields, nor the request representation.
 </t>
 </section>
@@ -1587 +1587 @@
    The no-transform response directive indicates that an intermediary
    (regardless of whether it implements a cache) &MUST-NOT; change the 
-   Content-Encoding, Content-Range or Content-Type response header fields, 
-   nor the response representation.
+   Content-Encoding, <x:ref>Content-Range</x:ref> or Content-Type response
+   header fields, nor the response representation.
 </t>
 </section>
@@ -2354 +2354 @@
     <x:source basename="p5-range" href="p5-range.xml">
       <x:defines>206 (Partial Content)</x:defines>
+      <x:defines>Content-Range</x:defines>
+      <x:defines>Range</x:defines>
     </x:source>
   </reference>