Changeset 2675


Ignore:
Timestamp:
May 14, 2014, 9:26:01 AM (6 years ago)
Author:
julian.reschke@…
Message:

add status code names (#553)

Location:
draft-ietf-httpbis/latest
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/auth48/p4-conditional.unpg.txt

    r2674 r2675  
    977977   header fields but that instructs the recipient to ignore the Range
    978978   header field if the validator doesn't match, resulting in transfer of
    979    the new selected representation instead of a 412 response.  If-Range
    980    is defined in Section 3.2 of [RFC7233].
     979   the new selected representation instead of a 412 (Precondition
     980   Failed) response.  If-Range is defined in Section 3.2 of [RFC7233].
    981981
    9829824.  Status Code Definitions
     
    10411041   all received preconditions if its response to the same request
    10421042   without those conditions would have been a status code other than a
    1043    2xx or 412 (Precondition Failed).  In other words, redirects and
    1044    failures take precedence over the evaluation of preconditions in
    1045    conditional requests.
     1043   2xx (Successful) or 412 (Precondition Failed).  In other words,
     1044   redirects and failures take precedence over the evaluation of
     1045   preconditions in conditional requests.
    10461046
    10471047   A server that is not the origin server for the target resource and
  • draft-ietf-httpbis/latest/auth48/rfc7232.abdiff.txt

    r2674 r2675  
    209209
    210210
    211 Section 3.5., paragraph 1:
    212 OLD:
    213 
    214     The "If-Range" header field provides a special conditional request
    215     mechanism that is similar to the If-Match and If-Unmodified-Since
    216     header fields but that instructs the recipient to ignore the Range
    217     header field if the validator doesn't match, resulting in transfer of
    218     the new selected representation instead of a 412 response.  If-Range
    219     is defined in Section 3.2 of [RFC7233].
    220 
    221 NEW:
    222 
    223     The "If-Range" header field provides a special conditional request
    224     mechanism that is similar to the If-Match and If-Unmodified-Since
    225     header fields but that instructs the recipient to ignore the Range
    226     header field if the validator doesn't match, resulting in transfer of
    227     the new selected representation instead of a 412 (Precondition
    228     Failed) response.  If-Range is defined in Section 3.2 of [RFC7233].
    229 
    230 
    231211Section 4.1., paragraph 2:
    232212OLD:
     
    295275
    296276
    297 Section 5., paragraph 1:
    298 OLD:
    299 
    300     Except when excluded below, a recipient cache or origin server MUST
    301     evaluate received request preconditions after it has successfully
    302     performed its normal request checks and just before it would perform
    303     the action associated with the request method.  A server MUST ignore
    304     all received preconditions if its response to the same request
    305     without those conditions would have been a status code other than a
    306     2xx or 412 (Precondition Failed).  In other words, redirects and
    307     failures take precedence over the evaluation of preconditions in
    308     conditional requests.
    309 
    310 NEW:
    311 
    312     Except when excluded below, a recipient cache or origin server MUST
    313     evaluate received request preconditions after it has successfully
    314     performed its normal request checks and just before it would perform
    315     the action associated with the request method.  A server MUST ignore
    316     all received preconditions if its response to the same request
    317     without those conditions would have been a status code other than a
    318     2xx (Successful) or 412 (Precondition Failed).  In other words,
    319     redirects and failures take precedence over the evaluation of
    320     preconditions in conditional requests.
    321 
    322 
    323277Section 7.1., paragraph 1:
    324278OLD:
  • draft-ietf-httpbis/latest/auth48/rfc7232.diff.html

    r2674 r2675  
    226226      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    227227      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    228       <tr bgcolor="gray" ><td></td><th><a name="part-l6" /><small>skipping to change at</small><em> page 18, line 11</em></th><th> </th><th><a name="part-r6" /><small>skipping to change at</small><em> page 18, line 11</em></th><td></td></tr>
    229       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    230       <tr><td class="lineno" valign="top"></td><td class="left">   The If-Unmodified-Since header field can be ignored by caches and</td><td> </td><td class="right">   The If-Unmodified-Since header field can be ignored by caches and</td><td class="lineno" valign="top"></td></tr>
    231       <tr><td class="lineno" valign="top"></td><td class="left">   intermediaries because it is not applicable to a stored response.</td><td> </td><td class="right">   intermediaries because it is not applicable to a stored response.</td><td class="lineno" valign="top"></td></tr>
    232       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    233       <tr><td class="lineno" valign="top"></td><td class="left">3.5.  If-Range</td><td> </td><td class="right">3.5.  If-Range</td><td class="lineno" valign="top"></td></tr>
    234       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    235       <tr><td class="lineno" valign="top"></td><td class="left">   The "If-Range" header field provides a special conditional request</td><td> </td><td class="right">   The "If-Range" header field provides a special conditional request</td><td class="lineno" valign="top"></td></tr>
    236       <tr><td class="lineno" valign="top"></td><td class="left">   mechanism that is similar to the If-Match and If-Unmodified-Since</td><td> </td><td class="right">   mechanism that is similar to the If-Match and If-Unmodified-Since</td><td class="lineno" valign="top"></td></tr>
    237       <tr><td class="lineno" valign="top"></td><td class="left">   header fields but that instructs the recipient to ignore the Range</td><td> </td><td class="right">   header fields but that instructs the recipient to ignore the Range</td><td class="lineno" valign="top"></td></tr>
    238       <tr><td class="lineno" valign="top"></td><td class="left">   header field if the validator doesn't match, resulting in transfer of</td><td> </td><td class="right">   header field if the validator doesn't match, resulting in transfer of</td><td class="lineno" valign="top"></td></tr>
    239       <tr><td><a name="diff0012" /></td></tr>
    240       <tr><td class="lineno" valign="top"></td><td class="lblock">   the new selected representation instead of a 412 response.  If-Range</td><td> </td><td class="rblock">   the new selected representation instead of a 412 <span class="insert">(Precondition</span></td><td class="lineno" valign="top"></td></tr>
    241       <tr><td class="lineno" valign="top"></td><td class="lblock">   is defined in Section 3.2 of [RFC7233].</td><td> </td><td class="rblock"><span class="insert">   Failed)</span> response.  If-Range is defined in Section 3.2 of [RFC7233].</td><td class="lineno" valign="top"></td></tr>
    242       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    243       <tr><td class="lineno" valign="top"></td><td class="left">4.  Status Code Definitions</td><td> </td><td class="right">4.  Status Code Definitions</td><td class="lineno" valign="top"></td></tr>
    244       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    245       <tr><td class="lineno" valign="top"></td><td class="left">4.1.  304 Not Modified</td><td> </td><td class="right">4.1.  304 Not Modified</td><td class="lineno" valign="top"></td></tr>
    246       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     228      <tr bgcolor="gray" ><td></td><th><a name="part-l6" /><small>skipping to change at</small><em> page 18, line 28</em></th><th> </th><th><a name="part-r6" /><small>skipping to change at</small><em> page 18, line 28</em></th><td></td></tr>
    247229      <tr><td class="lineno" valign="top"></td><td class="left">   The 304 (Not Modified) status code indicates that a conditional GET</td><td> </td><td class="right">   The 304 (Not Modified) status code indicates that a conditional GET</td><td class="lineno" valign="top"></td></tr>
    248230      <tr><td class="lineno" valign="top"></td><td class="left">   or HEAD request has been received and would have resulted in a 200</td><td> </td><td class="right">   or HEAD request has been received and would have resulted in a 200</td><td class="lineno" valign="top"></td></tr>
     
    255237      <tr><td class="lineno" valign="top"></td><td class="left">   representation as if it were the payload of a 200 (OK) response.</td><td> </td><td class="right">   representation as if it were the payload of a 200 (OK) response.</td><td class="lineno" valign="top"></td></tr>
    256238      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    257       <tr><td><a name="diff0013" /></td></tr>
     239      <tr><td><a name="diff0012" /></td></tr>
    258240      <tr><td class="lineno" valign="top"></td><td class="lblock">   The server generating a 304 response MUST generate any of the</td><td> </td><td class="rblock">   The server generating a 304 <span class="insert">(Not Modified)</span> response MUST generate any</td><td class="lineno" valign="top"></td></tr>
    259241      <tr><td class="lineno" valign="top"></td><td class="lblock">   following header fields that would have been sent in a 200 (OK)</td><td> </td><td class="rblock">   of the following header fields that would have been sent in a 200</td><td class="lineno" valign="top"></td></tr>
     
    261243      <tr><td class="lineno" valign="top"></td><td class="lblock">   ETag, Expires, and Vary.</td><td> </td><td class="rblock">   Date, ETag, Expires, and Vary.</td><td class="lineno" valign="top"></td></tr>
    262244      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    263       <tr><td><a name="diff0014" /></td></tr>
     245      <tr><td><a name="diff0013" /></td></tr>
    264246      <tr><td class="lineno" valign="top"></td><td class="lblock">   Since the goal of a 304 response is to minimize information transfer</td><td> </td><td class="rblock">   Since the goal of a 304 <span class="insert">(Not Modified)</span> response is to minimize</td><td class="lineno" valign="top"></td></tr>
    265247      <tr><td class="lineno" valign="top"></td><td class="lblock">   when the recipient already has one or more cached representations, a</td><td> </td><td class="rblock">   information transfer when the recipient already has one or more</td><td class="lineno" valign="top"></td></tr>
     
    269251      <tr><td class="lineno" valign="top"></td><td class="lblock">   response does not have an ETag field).</td><td> </td><td class="rblock">   might be useful if the response does not have an ETag field).</td><td class="lineno" valign="top"></td></tr>
    270252      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    271       <tr><td><a name="diff0015" /></td></tr>
     253      <tr><td><a name="diff0014" /></td></tr>
    272254      <tr><td class="lineno" valign="top"></td><td class="lblock">   Requirements on a cache that receives a 304 response are defined in</td><td> </td><td class="rblock">   Requirements on a cache that receives a 304 <span class="insert">(Not Modified)</span> response</td><td class="lineno" valign="top"></td></tr>
    273255      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section 4.3.4 of [RFC7234].  If the conditional request originated</td><td> </td><td class="rblock">   are defined in Section 4.3.4 of [RFC7234].  If the conditional</td><td class="lineno" valign="top"></td></tr>
     
    276258      <tr><td class="lineno" valign="top"></td><td class="lblock">   forward the 304 response to that client.</td><td> </td><td class="rblock">   proxy SHOULD forward the 304 <span class="insert">(Not Modified)</span> response to that client.</td><td class="lineno" valign="top"></td></tr>
    277259      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    278       <tr><td><a name="diff0016" /></td></tr>
     260      <tr><td><a name="diff0015" /></td></tr>
    279261      <tr><td class="lineno" valign="top"></td><td class="lblock">   A 304 response cannot contain a message-body; it is always terminated</td><td> </td><td class="rblock">   A 304 <span class="insert">(Not Modified)</span> response cannot contain a message-body; it is</td><td class="lineno" valign="top"></td></tr>
    280262      <tr><td class="lineno" valign="top"></td><td class="lblock">   by the first empty line after the header fields.</td><td> </td><td class="rblock">   always terminated by the first empty line after the header fields.</td><td class="lineno" valign="top"></td></tr>
     
    289271      <tr><td class="lineno" valign="top"></td><td class="left">   from being applied if the target resource is in an unexpected state.</td><td> </td><td class="right">   from being applied if the target resource is in an unexpected state.</td><td class="lineno" valign="top"></td></tr>
    290272      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    291       <tr><td class="lineno" valign="top"></td><td class="left">5.  Evaluation</td><td> </td><td class="right">5.  Evaluation</td><td class="lineno" valign="top"></td></tr>
    292       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    293       <tr><td class="lineno" valign="top"></td><td class="left">   Except when excluded below, a recipient cache or origin server MUST</td><td> </td><td class="right">   Except when excluded below, a recipient cache or origin server MUST</td><td class="lineno" valign="top"></td></tr>
    294       <tr><td class="lineno" valign="top"></td><td class="left">   evaluate received request preconditions after it has successfully</td><td> </td><td class="right">   evaluate received request preconditions after it has successfully</td><td class="lineno" valign="top"></td></tr>
    295       <tr><td class="lineno" valign="top"></td><td class="left">   performed its normal request checks and just before it would perform</td><td> </td><td class="right">   performed its normal request checks and just before it would perform</td><td class="lineno" valign="top"></td></tr>
    296       <tr><td class="lineno" valign="top"></td><td class="left">   the action associated with the request method.  A server MUST ignore</td><td> </td><td class="right">   the action associated with the request method.  A server MUST ignore</td><td class="lineno" valign="top"></td></tr>
    297       <tr><td class="lineno" valign="top"></td><td class="left">   all received preconditions if its response to the same request</td><td> </td><td class="right">   all received preconditions if its response to the same request</td><td class="lineno" valign="top"></td></tr>
    298       <tr><td class="lineno" valign="top"></td><td class="left">   without those conditions would have been a status code other than a</td><td> </td><td class="right">   without those conditions would have been a status code other than a</td><td class="lineno" valign="top"></td></tr>
    299       <tr><td><a name="diff0017" /></td></tr>
    300       <tr><td class="lineno" valign="top"></td><td class="lblock">   2xx or 412 (Precondition Failed).  In other words, redirects and</td><td> </td><td class="rblock">   2xx <span class="insert">(Successful)</span> or 412 (Precondition Failed).  In other words,</td><td class="lineno" valign="top"></td></tr>
    301       <tr><td class="lineno" valign="top"></td><td class="lblock">   failures take precedence over the evaluation of preconditions in</td><td> </td><td class="rblock">   redirects and failures take precedence over the evaluation of</td><td class="lineno" valign="top"></td></tr>
    302       <tr><td class="lineno" valign="top"></td><td class="lblock">   conditional requests.</td><td> </td><td class="rblock">   preconditions in conditional requests.</td><td class="lineno" valign="top"></td></tr>
    303       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    304       <tr><td class="lineno" valign="top"></td><td class="left">   A server that is not the origin server for the target resource and</td><td> </td><td class="right">   A server that is not the origin server for the target resource and</td><td class="lineno" valign="top"></td></tr>
    305       <tr><td class="lineno" valign="top"></td><td class="left">   cannot act as a cache for requests on the target resource MUST NOT</td><td> </td><td class="right">   cannot act as a cache for requests on the target resource MUST NOT</td><td class="lineno" valign="top"></td></tr>
    306       <tr><td class="lineno" valign="top"></td><td class="left">   evaluate the conditional request header fields defined by this</td><td> </td><td class="right">   evaluate the conditional request header fields defined by this</td><td class="lineno" valign="top"></td></tr>
    307       <tr><td class="lineno" valign="top"></td><td class="left">   specification, and it MUST forward them if the request is forwarded,</td><td> </td><td class="right">   specification, and it MUST forward them if the request is forwarded,</td><td class="lineno" valign="top"></td></tr>
    308       <tr><td class="lineno" valign="top"></td><td class="left">   since the generating client intends that they be evaluated by a</td><td> </td><td class="right">   since the generating client intends that they be evaluated by a</td><td class="lineno" valign="top"></td></tr>
    309       <tr><td class="lineno" valign="top"></td><td class="left">   server that can provide a current representation.  Likewise, a server</td><td> </td><td class="right">   server that can provide a current representation.  Likewise, a server</td><td class="lineno" valign="top"></td></tr>
    310       <tr><td class="lineno" valign="top"></td><td class="left">   MUST ignore the conditional request header fields defined by this</td><td> </td><td class="right">   MUST ignore the conditional request header fields defined by this</td><td class="lineno" valign="top"></td></tr>
    311       <tr><td class="lineno" valign="top"></td><td class="left">   specification when received with a request method that does not</td><td> </td><td class="right">   specification when received with a request method that does not</td><td class="lineno" valign="top"></td></tr>
    312       <tr><td class="lineno" valign="top"></td><td class="left">   involve the selection or modification of a selected representation,</td><td> </td><td class="right">   involve the selection or modification of a selected representation,</td><td class="lineno" valign="top"></td></tr>
    313273      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    314274      <tr bgcolor="gray" ><td></td><th><a name="part-l7" /><small>skipping to change at</small><em> page 21, line 23</em></th><th> </th><th><a name="part-r7" /><small>skipping to change at</small><em> page 21, line 23</em></th><td></td></tr>
     
    323283      <tr><td class="lineno" valign="top"></td><td class="left">7.1.  Status Code Registration</td><td> </td><td class="right">7.1.  Status Code Registration</td><td class="lineno" valign="top"></td></tr>
    324284      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    325       <tr><td><a name="diff0018" /></td></tr>
     285      <tr><td><a name="diff0016" /></td></tr>
    326286      <tr><td class="lineno" valign="top"></td><td class="lblock">   The <span class="delete">"Hypertext Transfer Protocol (HTTP)</span> Status <span class="delete">Code Registry"</span> located</td><td> </td><td class="rblock">   The <span class="insert">"HTTP</span> Status <span class="insert">Codes" registry</span> located at</td><td class="lineno" valign="top"></td></tr>
    327287      <tr><td class="lineno" valign="top"></td><td class="lblock">   at &lt;http://www.iana.org/assignments/http-status-codes&gt; has been</td><td> </td><td class="rblock">   &lt;http://www.iana.org/assignments/http-status-codes&gt; has been updated</td><td class="lineno" valign="top"></td></tr>
     
    337297      <tr><td class="lineno" valign="top"></td><td class="left">7.2.  Header Field Registration</td><td> </td><td class="right">7.2.  Header Field Registration</td><td class="lineno" valign="top"></td></tr>
    338298      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    339       <tr><td><a name="diff0019" /></td></tr>
     299      <tr><td><a name="diff0017" /></td></tr>
    340300      <tr><td class="lineno" valign="top"></td><td class="lblock">   HTTP header fields are registered within the <span class="delete">"Message Headers"</span></td><td> </td><td class="rblock">   HTTP header fields are registered within the <span class="insert">Message Header Field</span></td><td class="lineno" valign="top"></td></tr>
    341301      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   registry</span> maintained at</td><td> </td><td class="rblock"><span class="insert">   Registry</span> maintained at</td><td class="lineno" valign="top"></td></tr>
    342302      <tr><td class="lineno" valign="top"></td><td class="left">   &lt;http://www.iana.org/assignments/message-headers/&gt;.</td><td> </td><td class="right">   &lt;http://www.iana.org/assignments/message-headers/&gt;.</td><td class="lineno" valign="top"></td></tr>
    343303      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    344       <tr><td><a name="diff0020" /></td></tr>
     304      <tr><td><a name="diff0018" /></td></tr>
    345305      <tr><td class="lineno" valign="top"></td><td class="lblock">   This document defines the following HTTP header fields, so <span class="delete">the</span></td><td> </td><td class="rblock">   This document defines the following HTTP header fields, so <span class="insert">their</span></td><td class="lineno" valign="top"></td></tr>
    346306      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   "Permanent Message Header Field Names"</span> registry <span class="delete">has</span> been updated</td><td> </td><td class="rblock"><span class="insert">   associated</span> registry <span class="insert">entries have</span> been updated <span class="insert">according to the</span></td><td class="lineno" valign="top"></td></tr>
     
    366326      <tr><td class="lineno" valign="top"></td><td class="left">   and users of known security concerns specific to the HTTP conditional</td><td> </td><td class="right">   and users of known security concerns specific to the HTTP conditional</td><td class="lineno" valign="top"></td></tr>
    367327      <tr><td class="lineno" valign="top"></td><td class="left">   request mechanisms.  More general security considerations are</td><td> </td><td class="right">   request mechanisms.  More general security considerations are</td><td class="lineno" valign="top"></td></tr>
    368       <tr><td><a name="diff0021" /></td></tr>
     328      <tr><td><a name="diff0019" /></td></tr>
    369329      <tr><td class="lineno" valign="top"></td><td class="lblock">   addressed in HTTP messaging [RFC7230] and semantics <span class="delete">[RFC7231].</span></td><td> </td><td class="rblock">   addressed in <span class="insert">the</span> HTTP messaging [RFC7230] and semantics <span class="insert">[RFC7231]</span></td><td class="lineno" valign="top"></td></tr>
    370330      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   documents.</span></td><td class="lineno" valign="top"></td></tr>
     
    391351      <tr><td class="lineno" valign="top"></td><td class="left">   [RFC7230]  Fielding, R., Ed. and J. Reschke, Ed., "Hypertext Transfer</td><td> </td><td class="right">   [RFC7230]  Fielding, R., Ed. and J. Reschke, Ed., "Hypertext Transfer</td><td class="lineno" valign="top"></td></tr>
    392352      <tr><td class="lineno" valign="top"></td><td class="left">              Protocol (HTTP/1.1): Message Syntax and Routing",</td><td> </td><td class="right">              Protocol (HTTP/1.1): Message Syntax and Routing",</td><td class="lineno" valign="top"></td></tr>
    393       <tr><td><a name="diff0022" /></td></tr>
     353      <tr><td><a name="diff0020" /></td></tr>
    394354      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p1-messaging-latest (work in progress),</span></td><td> </td><td class="rblock">              <span class="insert">RFC 7230,</span> May 2014.</td><td class="lineno" valign="top"></td></tr>
    395355      <tr><td class="lineno" valign="top"></td><td class="lblock">              May 2014.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    396356      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    397357      <tr><td class="lineno" valign="top"></td><td class="left">   [RFC7231]  Fielding, R., Ed. and J. Reschke, Ed., "Hypertext Transfer</td><td> </td><td class="right">   [RFC7231]  Fielding, R., Ed. and J. Reschke, Ed., "Hypertext Transfer</td><td class="lineno" valign="top"></td></tr>
    398       <tr><td><a name="diff0023" /></td></tr>
     358      <tr><td><a name="diff0021" /></td></tr>
    399359      <tr><td class="lineno" valign="top"></td><td class="lblock">              Protocol (HTTP/1.1): Semantics and Content",</td><td> </td><td class="rblock">              Protocol (HTTP/1.1): Semantics and Content", <span class="insert">RFC 7231,</span></td><td class="lineno" valign="top"></td></tr>
    400360      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p2-semantics-latest (work in progress),</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    403363      <tr><td class="lineno" valign="top"></td><td class="left">   [RFC7233]  Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [RFC7233]  Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    404364      <tr><td class="lineno" valign="top"></td><td class="left">              "Hypertext Transfer Protocol (HTTP/1.1): Range Requests",</td><td> </td><td class="right">              "Hypertext Transfer Protocol (HTTP/1.1): Range Requests",</td><td class="lineno" valign="top"></td></tr>
    405       <tr><td><a name="diff0024" /></td></tr>
     365      <tr><td><a name="diff0022" /></td></tr>
    406366      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p5-range-latest (work in progress),</span></td><td> </td><td class="rblock">              <span class="insert">RFC 7233,</span> May 2014.</td><td class="lineno" valign="top"></td></tr>
    407367      <tr><td class="lineno" valign="top"></td><td class="lblock">              May 2014.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    409369      <tr><td class="lineno" valign="top"></td><td class="left">   [RFC7234]  Fielding, R., Ed., Nottingham, M., Ed., and J. Reschke,</td><td> </td><td class="right">   [RFC7234]  Fielding, R., Ed., Nottingham, M., Ed., and J. Reschke,</td><td class="lineno" valign="top"></td></tr>
    410370      <tr><td class="lineno" valign="top"></td><td class="left">              Ed., "Hypertext Transfer Protocol (HTTP/1.1): Caching",</td><td> </td><td class="right">              Ed., "Hypertext Transfer Protocol (HTTP/1.1): Caching",</td><td class="lineno" valign="top"></td></tr>
    411       <tr><td><a name="diff0025" /></td></tr>
     371      <tr><td><a name="diff0023" /></td></tr>
    412372      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p6-cache-latest (work in progress),</span></td><td> </td><td class="rblock">              <span class="insert">RFC 7234,</span> May 2014.</td><td class="lineno" valign="top"></td></tr>
    413373      <tr><td class="lineno" valign="top"></td><td class="lblock">              May 2014.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    428388      <tr><td class="lineno" valign="top"></td><td class="left">Appendix A.  Changes from RFC 2616</td><td> </td><td class="right">Appendix A.  Changes from RFC 2616</td><td class="lineno" valign="top"></td></tr>
    429389      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    430       <tr><td><a name="diff0026" /></td></tr>
     390      <tr><td><a name="diff0024" /></td></tr>
    431391      <tr><td class="lineno" valign="top"></td><td class="lblock">   The definition of validator weakness has been expanded and <span class="delete">clarified.</span></td><td> </td><td class="rblock">   The definition of validator weakness has been expanded and <span class="insert">clarified</span></td><td class="lineno" valign="top"></td></tr>
    432392      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">2.1)</span></td><td> </td><td class="rblock">   (Section <span class="insert">2.1).</span></td><td class="lineno" valign="top"></td></tr>
    433393      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    434394      <tr><td class="lineno" valign="top"></td><td class="left">   Weak entity-tags are now allowed in all requests except range</td><td> </td><td class="right">   Weak entity-tags are now allowed in all requests except range</td><td class="lineno" valign="top"></td></tr>
    435       <tr><td><a name="diff0027" /></td></tr>
     395      <tr><td><a name="diff0025" /></td></tr>
    436396      <tr><td class="lineno" valign="top"></td><td class="lblock">   requests.  (Sections 2.1 and <span class="delete">3.2)</span></td><td> </td><td class="rblock">   requests.  (Sections 2.1 and <span class="insert">3.2.)</span></td><td class="lineno" valign="top"></td></tr>
    437397      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
    438398      <tr><td class="lineno" valign="top"></td><td class="left">   The ETag header field ABNF has been changed to not use quoted-string,</td><td> </td><td class="right">   The ETag header field ABNF has been changed to not use quoted-string,</td><td class="lineno" valign="top"></td></tr>
    439       <tr><td><a name="diff0028" /></td></tr>
     399      <tr><td><a name="diff0026" /></td></tr>
    440400      <tr><td class="lineno" valign="top"></td><td class="lblock">   thus avoiding escaping issues<span class="delete">.  (Section 2.3)</span></td><td> </td><td class="rblock">   thus avoiding escaping issues<span class="insert"> (Section 2.3).</span></td><td class="lineno" valign="top"></td></tr>
    441401      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    442402      <tr><td class="lineno" valign="top"></td><td class="left">   ETag is defined to provide an entity tag for the selected</td><td> </td><td class="right">   ETag is defined to provide an entity tag for the selected</td><td class="lineno" valign="top"></td></tr>
    443403      <tr><td class="lineno" valign="top"></td><td class="left">   representation, thereby clarifying what it applies to in various</td><td> </td><td class="right">   representation, thereby clarifying what it applies to in various</td><td class="lineno" valign="top"></td></tr>
    444       <tr><td><a name="diff0029" /></td></tr>
     404      <tr><td><a name="diff0027" /></td></tr>
    445405      <tr><td class="lineno" valign="top"></td><td class="lblock">   situations (such as a PUT response)<span class="delete">.  (Section 2.3)</span></td><td> </td><td class="rblock">   situations (such as a PUT response)<span class="insert"> (Section 2.3).</span></td><td class="lineno" valign="top"></td></tr>
    446406      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    447407      <tr><td class="lineno" valign="top"></td><td class="left">   The precedence for evaluation of conditional requests has been</td><td> </td><td class="right">   The precedence for evaluation of conditional requests has been</td><td class="lineno" valign="top"></td></tr>
    448       <tr><td><a name="diff0030" /></td></tr>
     408      <tr><td><a name="diff0028" /></td></tr>
    449409      <tr><td class="lineno" valign="top"></td><td class="lblock">   defined<span class="delete">.  (Section 6)</span></td><td> </td><td class="rblock">   defined<span class="insert"> (Section 6).</span></td><td class="lineno" valign="top"></td></tr>
    450410      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    460420      <tr><td class="lineno" valign="top"></td><td class="left">   The rules below are defined in [RFC7230]:</td><td> </td><td class="right">   The rules below are defined in [RFC7230]:</td><td class="lineno" valign="top"></td></tr>
    461421      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    462       <tr><td><a name="diff0031" /></td></tr>
     422      <tr><td><a name="diff0029" /></td></tr>
    463423      <tr><td class="lineno" valign="top"></td><td class="lblock">     OWS           = &lt;OWS, <span class="delete">see</span> [RFC7230], Section 3.2.3&gt;</td><td> </td><td class="rblock">     OWS           = &lt;OWS, <span class="insert">defined in</span> [RFC7230], Section 3.2.3&gt;</td><td class="lineno" valign="top"></td></tr>
    464424      <tr><td class="lineno" valign="top"></td><td class="lblock">     obs-text      = &lt;obs-text, <span class="delete">see</span> [RFC7230], Section 3.2.6&gt;</td><td> </td><td class="rblock">     obs-text      = &lt;obs-text, <span class="insert">defined in</span> [RFC7230], Section 3.2.6&gt;</td><td class="lineno" valign="top"></td></tr>
    465425      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    466       <tr><td><a name="diff0032" /></td></tr>
     426      <tr><td><a name="diff0030" /></td></tr>
    467427      <tr><td class="lineno" valign="top"></td><td class="lblock">   The rule<span class="delete">s below are defined in other parts</span>:</td><td> </td><td class="rblock">   The rule<span class="insert"> below is defined in [RFC7231]</span>:</td><td class="lineno" valign="top"></td></tr>
    468428      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    469       <tr><td><a name="diff0033" /></td></tr>
     429      <tr><td><a name="diff0031" /></td></tr>
    470430      <tr><td class="lineno" valign="top"></td><td class="lblock">     HTTP-date     = &lt;HTTP-date, <span class="delete">see</span> [RFC7231], Section 7.1.1.1&gt;</td><td> </td><td class="rblock">     HTTP-date     = &lt;HTTP-date, <span class="insert">defined in</span> [RFC7231], Section 7.1.1.1&gt;</td><td class="lineno" valign="top"></td></tr>
    471431      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    477437      <tr><td class="lineno" valign="top"></td><td class="left">   ETag = entity-tag</td><td> </td><td class="right">   ETag = entity-tag</td><td class="lineno" valign="top"></td></tr>
    478438      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    479       <tr><td><a name="diff0034" /></td></tr>
     439      <tr><td><a name="diff0032" /></td></tr>
    480440      <tr><td class="lineno" valign="top"></td><td class="lblock">   HTTP-date = &lt;HTTP-date, <span class="delete">see</span> [RFC7231], Section 7.1.1.1&gt;</td><td> </td><td class="rblock">   HTTP-date = &lt;HTTP-date, <span class="insert">defined in</span> [RFC7231], Section 7.1.1.1&gt;</td><td class="lineno" valign="top"></td></tr>
    481441      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    489449      <tr><td class="lineno" valign="top"></td><td class="left">   Last-Modified = HTTP-date</td><td> </td><td class="right">   Last-Modified = HTTP-date</td><td class="lineno" valign="top"></td></tr>
    490450      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    491       <tr><td><a name="diff0035" /></td></tr>
     451      <tr><td><a name="diff0033" /></td></tr>
    492452      <tr><td class="lineno" valign="top"></td><td class="lblock">   OWS = &lt;OWS, <span class="delete">see</span> [RFC7230], Section 3.2.3&gt;</td><td> </td><td class="rblock">   OWS = &lt;OWS, <span class="insert">defined in</span> [RFC7230], Section 3.2.3&gt;</td><td class="lineno" valign="top"></td></tr>
    493453      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    496456      <tr><td class="lineno" valign="top"></td><td class="left">    / obs-text</td><td> </td><td class="right">    / obs-text</td><td class="lineno" valign="top"></td></tr>
    497457      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    498       <tr><td><a name="diff0036" /></td></tr>
     458      <tr><td><a name="diff0034" /></td></tr>
    499459      <tr><td class="lineno" valign="top"></td><td class="lblock">   obs-text = &lt;obs-text, <span class="delete">see</span> [RFC7230], Section 3.2.6&gt;</td><td> </td><td class="rblock">   obs-text = &lt;obs-text, <span class="insert">defined in</span> [RFC7230], Section 3.2.6&gt;</td><td class="lineno" valign="top"></td></tr>
    500460      <tr><td class="lineno" valign="top"></td><td class="left">   opaque-tag = DQUOTE *etagc DQUOTE</td><td> </td><td class="right">   opaque-tag = DQUOTE *etagc DQUOTE</td><td class="lineno" valign="top"></td></tr>
     
    510470
    511471     <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
    512      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 36 change blocks.&nbsp;</a></th></tr>
    513      <tr class="stats"><td></td><th><i>92 lines changed or deleted</i></th><th><i> </i></th><th><i>73 lines changed or added</i></th><td></td></tr>
     472     <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 34 change blocks.&nbsp;</a></th></tr>
     473     <tr class="stats"><td></td><th><i>87 lines changed or deleted</i></th><th><i> </i></th><th><i>68 lines changed or added</i></th><td></td></tr>
    514474     <tr><td colspan="5" align="center" class="small"><br/>This html diff was produced by rfcdiff 1.38. The latest version is available from <a href="http://www.tools.ietf.org/tools/rfcdiff/" >http://tools.ietf.org/tools/rfcdiff/</a> </td></tr>
    515475   </table>
  • draft-ietf-httpbis/latest/p4-conditional.html

    r2674 r2675  
    11041104         <div id="header.if-range">
    11051105            <h2 id="rfc.section.3.5"><a href="#rfc.section.3.5">3.5</a>&nbsp;<a href="#header.if-range">If-Range</a></h2>
    1106             <p id="rfc.section.3.5.p.1">The "If-Range" header field provides a special conditional request mechanism that is similar to the <a href="#header.if-match" class="smpl">If-Match</a> and <a href="#header.if-unmodified-since" class="smpl">If-Unmodified-Since</a> header fields but that instructs the recipient to ignore the <a href="p5-range.html#header.range" class="smpl">Range</a> header field if the validator doesn't match, resulting in transfer of the new selected representation instead of a 412 response.
    1107                If-Range is defined in <a href="p5-range.html#header.if-range" title="If-Range">Section 3.2</a> of <a href="#RFC7233" id="rfc.xref.RFC7233.1"><cite title="Hypertext Transfer Protocol (HTTP/1.1): Range Requests">[RFC7233]</cite></a>.
     1106            <p id="rfc.section.3.5.p.1">The "If-Range" header field provides a special conditional request mechanism that is similar to the <a href="#header.if-match" class="smpl">If-Match</a> and <a href="#header.if-unmodified-since" class="smpl">If-Unmodified-Since</a> header fields but that instructs the recipient to ignore the <a href="p5-range.html#header.range" class="smpl">Range</a> header field if the validator doesn't match, resulting in transfer of the new selected representation instead of a <a href="#status.412" class="smpl">412 (Precondition Failed)</a> response. If-Range is defined in <a href="p5-range.html#header.if-range" title="If-Range">Section 3.2</a> of <a href="#RFC7233" id="rfc.xref.RFC7233.1"><cite title="Hypertext Transfer Protocol (HTTP/1.1): Range Requests">[RFC7233]</cite></a>.
    11081107            </p>
    11091108         </div>
     
    11431142         <p id="rfc.section.5.p.1">Except when excluded below, a recipient cache or origin server <em class="bcp14">MUST</em> evaluate received request preconditions after it has successfully performed its normal request checks and just before it would
    11441143            perform the action associated with the request method. A server <em class="bcp14">MUST</em> ignore all received preconditions if its response to the same request without those conditions would have been a status code
    1145             other than a <a href="p2-semantics.html#status.2xx" class="smpl">2xx</a> or <a href="#status.412" class="smpl">412 (Precondition Failed)</a>. In other words, redirects and failures take precedence over the evaluation of preconditions in conditional requests.
     1144            other than a <a href="p2-semantics.html#status.2xx" class="smpl">2xx (Successful)</a> or <a href="#status.412" class="smpl">412 (Precondition Failed)</a>. In other words, redirects and failures take precedence over the evaluation of preconditions in conditional requests.
    11461145         </p>
    11471146         <p id="rfc.section.5.p.2">A server that is not the origin server for the target resource and cannot act as a cache for requests on the target resource <em class="bcp14">MUST NOT</em> evaluate the conditional request header fields defined by this specification, and it <em class="bcp14">MUST</em> forward them if the request is forwarded, since the generating client intends that they be evaluated by a server that can
  • draft-ietf-httpbis/latest/p4-conditional.xml

    r2674 r2675  
    950950   recipient to ignore the <x:ref>Range</x:ref> header field if the validator
    951951   doesn't match, resulting in transfer of the new selected representation
    952    instead of a 412 response. If-Range is defined in &header-if-range;.
     952   instead of a <x:ref>412 (Precondition Failed)</x:ref> response. If-Range is
     953   defined in &header-if-range;.
    953954</t>
    954955</section>
     
    10261027   A server &MUST; ignore all received preconditions if its response to the
    10271028   same request without those conditions would have been a status code other
    1028    than a <x:ref>2xx</x:ref> or <x:ref>412 (Precondition Failed)</x:ref>.
     1029   than a <x:ref>2xx (Successful)</x:ref> or <x:ref>412 (Precondition Failed)</x:ref>.
    10291030   In other words, redirects and failures take precedence over the evaluation
    10301031   of preconditions in conditional requests.
Note: See TracChangeset for help on using the changeset viewer.