Changeset 1809


Ignore:
Timestamp:
Jul 16, 2012, 9:42:58 AM (7 years ago)
Author:
julian.reschke@…
Message:

Remove mentions of "seven" parts.

Location:
draft-ietf-httpbis
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/20

  • draft-ietf-httpbis/20/draft-ietf-httpbis-p5-range-20.txt

    r1807 r1809  
    1818   The Hypertext Transfer Protocol (HTTP) is an application-level
    1919   protocol for distributed, collaborative, hypertext information
    20    systems.  HTTP has been in use by the World Wide Web global
    21    information initiative since 1990.  This document is Part 5 of the
    22    seven-part specification that defines the protocol referred to as
    23    "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    24 
    25    Part 5 defines range requests and the rules for constructing and
    26    combining responses to those requests.
     20   systems.  This document defines range requests and the rules for
     21   constructing and combining responses to those requests.
    2722
    2823Editorial Note (To be removed by RFC Editor)
     
    5045
    5146   Internet-Drafts are draft documents valid for a maximum of six months
    52 
    53 
    54 
    55 Fielding, et al.        Expires January 17, 2013                [Page 1]
    56 
    57 
    58 Internet-Draft              HTTP/1.1, Part 5                   July 2012
    59 
    60 
    6147   and may be updated, replaced, or obsoleted by other documents at any
    6248   time.  It is inappropriate to use Internet-Drafts as reference
     
    6450
    6551   This Internet-Draft will expire on January 17, 2013.
     52
     53
     54
     55Fielding, et al.        Expires January 17, 2013                [Page 1]
     56
     57
     58Internet-Draft              HTTP/1.1, Part 5                   July 2012
     59
    6660
    6761Copyright Notice
     
    9185   it for publication as an RFC or to translate it into languages other
    9286   than English.
     87
     88
     89
     90
     91
     92
    9393
    9494
  • draft-ietf-httpbis/20/draft-ietf-httpbis-p5-range-20.xml

    r1807 r1809  
    7575<t>
    7676   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    77    distributed, collaborative, hypertext information systems. HTTP has been in
    78    use by the World Wide Web global information initiative since 1990. This
    79    document is Part 5 of the seven-part specification that defines the protocol
    80    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    81 </t>
    82 <t>
    83    Part 5 defines range requests and the rules for constructing and
    84    combining responses to those requests.
     77   distributed, collaborative, hypertext information systems. This document
     78   defines range requests and the rules for constructing and combining
     79   responses to those requests.
    8580</t>
    8681</abstract>
  • draft-ietf-httpbis/20/draft-ietf-httpbis-p6-cache-20.txt

    r1807 r1809  
    2020   The Hypertext Transfer Protocol (HTTP) is an application-level
    2121   protocol for distributed, collaborative, hypertext information
    22    systems.  HTTP has been in use by the World Wide Web global
    23    information initiative since 1990.  This document is Part 6 of the
    24    seven-part specification that defines the protocol referred to as
    25    "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    26 
    27    Part 6 defines requirements on HTTP caches and the associated header
    28    fields that control cache behavior or indicate cacheable response
    29    messages.
     22   systems.  This document defines requirements on HTTP caches and the
     23   associated header fields that control cache behavior or indicate
     24   cacheable response messages.
    3025
    3126Editorial Note (To be removed by RFC Editor)
     
    5045   Task Force (IETF).  Note that other groups may also distribute
    5146   working documents as Internet-Drafts.  The list of current Internet-
    52 
    53 
    54 
    55 Fielding, et al.        Expires January 17, 2013                [Page 1]
    56 
    57 
    58 Internet-Draft              HTTP/1.1, Part 6                   July 2012
    59 
    60 
    6147   Drafts is at http://datatracker.ietf.org/drafts/current/.
    6248
     
    6450   and may be updated, replaced, or obsoleted by other documents at any
    6551   time.  It is inappropriate to use Internet-Drafts as reference
     52
     53
     54
     55Fielding, et al.        Expires January 17, 2013                [Page 1]
     56
     57
     58Internet-Draft              HTTP/1.1, Part 6                   July 2012
     59
     60
    6661   material or to cite them other than as "work in progress."
    6762
     
    107102     3.1.  Storing Incomplete Responses . . . . . . . . . . . . . . .  9
    108103     3.2.  Storing Responses to Authenticated Requests  . . . . . . .  9
    109 
    110 
    111 
    112 Fielding, et al.        Expires January 17, 2013                [Page 2]
    113 
    114 
    115 Internet-Draft              HTTP/1.1, Part 6                   July 2012
    116 
    117 
    118104   4.  Constructing Responses from Caches . . . . . . . . . . . . . . 10
    119105     4.1.  Freshness Model  . . . . . . . . . . . . . . . . . . . . . 11
     
    121107       4.1.2.  Calculating Heuristic Freshness  . . . . . . . . . . . 12
    122108       4.1.3.  Calculating Age  . . . . . . . . . . . . . . . . . . . 13
     109
     110
     111
     112Fielding, et al.        Expires January 17, 2013                [Page 2]
     113
     114
     115Internet-Draft              HTTP/1.1, Part 6                   July 2012
     116
     117
    123118       4.1.4.  Serving Stale Responses  . . . . . . . . . . . . . . . 15
    124119     4.2.  Validation Model . . . . . . . . . . . . . . . . . . . . . 16
     
    167162
    168163
     164
     165
     166
     167
     168
    169169Fielding, et al.        Expires January 17, 2013                [Page 3]
    170170
  • draft-ietf-httpbis/20/draft-ietf-httpbis-p6-cache-20.xml

    r1807 r1809  
    8383<t>
    8484   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    85    distributed, collaborative, hypertext information systems. HTTP has been in
    86    use by the World Wide Web global information initiative since 1990. This
    87    document is Part 6 of the seven-part specification that defines the protocol
    88    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    89 </t>
    90 <t>
    91    Part 6 defines requirements on HTTP caches and the associated header fields
     85   distributed, collaborative, hypertext information systems. This document
     86   defines requirements on HTTP caches and the associated header fields
    9287   that control cache behavior or indicate cacheable response messages.
    9388</t>
  • draft-ietf-httpbis/20/draft-ietf-httpbis-p7-auth-20.txt

    r1807 r1809  
    1818   The Hypertext Transfer Protocol (HTTP) is an application-level
    1919   protocol for distributed, collaborative, hypermedia information
    20    systems.  HTTP has been in use by the World Wide Web global
    21    information initiative since 1990.  This document is Part 7 of the
    22    seven-part specification that defines the protocol referred to as
    23    "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    24 
    25    Part 7 defines the HTTP Authentication framework.
     20   systems.  This document defines the HTTP Authentication framework.
    2621
    2722Editorial Note (To be removed by RFC Editor)
     
    5045   Internet-Drafts are draft documents valid for a maximum of six months
    5146   and may be updated, replaced, or obsoleted by other documents at any
    52 
    53 
    54 
    55 Fielding, et al.        Expires January 17, 2013                [Page 1]
    56 
    57 
    58 Internet-Draft              HTTP/1.1, Part 7                   July 2012
    59 
    60 
    6147   time.  It is inappropriate to use Internet-Drafts as reference
    6248   material or to cite them other than as "work in progress."
    6349
    6450   This Internet-Draft will expire on January 17, 2013.
     51
     52
     53
     54
     55Fielding, et al.        Expires January 17, 2013                [Page 1]
     56
     57
     58Internet-Draft              HTTP/1.1, Part 7                   July 2012
     59
    6560
    6661Copyright Notice
     
    9085   it for publication as an RFC or to translate it into languages other
    9186   than English.
     87
     88
     89
     90
     91
    9292
    9393
  • draft-ietf-httpbis/20/draft-ietf-httpbis-p7-auth-20.xml

    r1807 r1809  
    7474<t>
    7575   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    76    distributed, collaborative, hypermedia information systems. HTTP has been in
    77    use by the World Wide Web global information initiative since 1990. This
    78    document is Part 7 of the seven-part specification that defines the protocol
    79    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    80 </t>
    81 <t>
    82    Part 7 defines the HTTP Authentication framework.
     76   distributed, collaborative, hypermedia information systems. This document
     77   defines the HTTP Authentication framework.
    8378</t>
    8479</abstract>
  • draft-ietf-httpbis/20/p5-range.html

    r1807 r1809  
    495495      <meta name="dct.issued" scheme="ISO8601" content="2012-07-16">
    496496      <meta name="dct.replaces" content="urn:ietf:rfc:2616">
    497       <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 5 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 5 defines range requests and the rules for constructing and combining responses to those requests.">
    498       <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 5 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 5 defines range requests and the rules for constructing and combining responses to those requests.">
     497      <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. This document defines range requests and the rules for constructing and combining responses to those requests.">
     498      <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. This document defines range requests and the rules for constructing and combining responses to those requests.">
    499499   </head>
    500500   <body onload="init();">
     
    535535      <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
    536536      <p>The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information
    537          systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 5 of the
    538          seven-part specification that defines the protocol referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    539       </p> 
    540       <p>Part 5 defines range requests and the rules for constructing and combining responses to those requests.</p>
     537         systems. This document defines range requests and the rules for constructing and combining responses to those requests.
     538      </p>
    541539      <h1 id="rfc.note.1"><a href="#rfc.note.1">Editorial Note (To be removed by RFC Editor)</a></h1>
    542540      <p>Discussion of this draft takes place on the HTTPBIS working group mailing list (ietf-http-wg@w3.org), which is archived at &lt;<a href="http://lists.w3.org/Archives/Public/ietf-http-wg/">http://lists.w3.org/Archives/Public/ietf-http-wg/</a>&gt;.
  • draft-ietf-httpbis/20/p5-range.xml

    r1807 r1809  
    101101<t>
    102102   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    103    distributed, collaborative, hypertext information systems. HTTP has been in
    104    use by the World Wide Web global information initiative since 1990. This
    105    document is Part 5 of the seven-part specification that defines the protocol
    106    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    107 </t>
    108 <t>
    109    Part 5 defines range requests and the rules for constructing and
    110    combining responses to those requests.
     103   distributed, collaborative, hypertext information systems. This document
     104   defines range requests and the rules for constructing and combining
     105   responses to those requests.
    111106</t>
    112107</abstract>
  • draft-ietf-httpbis/20/p6-cache.html

    r1807 r1809  
    501501      <meta name="dct.issued" scheme="ISO8601" content="2012-07-16">
    502502      <meta name="dct.replaces" content="urn:ietf:rfc:2616">
    503       <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 6 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 6 defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable response messages.">
    504       <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 6 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 6 defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable response messages.">
     503      <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. This document defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable response messages.">
     504      <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. This document defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable response messages.">
    505505   </head>
    506506   <body onload="init();">
     
    549549      <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
    550550      <p>The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information
    551          systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 6 of the
    552          seven-part specification that defines the protocol referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    553       </p> 
    554       <p>Part 6 defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable
    555          response messages.
     551         systems. This document defines requirements on HTTP caches and the associated header fields that control cache behavior or
     552         indicate cacheable response messages.
    556553      </p>
    557554      <h1 id="rfc.note.1"><a href="#rfc.note.1">Editorial Note (To be removed by RFC Editor)</a></h1>
  • draft-ietf-httpbis/20/p6-cache.xml

    r1807 r1809  
    122122<t>
    123123   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    124    distributed, collaborative, hypertext information systems. HTTP has been in
    125    use by the World Wide Web global information initiative since 1990. This
    126    document is Part 6 of the seven-part specification that defines the protocol
    127    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    128 </t>
    129 <t>
    130    Part 6 defines requirements on HTTP caches and the associated header fields
     124   distributed, collaborative, hypertext information systems. This document
     125   defines requirements on HTTP caches and the associated header fields
    131126   that control cache behavior or indicate cacheable response messages.
    132127</t>
  • draft-ietf-httpbis/20/p7-auth.html

    r1807 r1809  
    492492      <meta name="dct.issued" scheme="ISO8601" content="2012-07-16">
    493493      <meta name="dct.replaces" content="urn:ietf:rfc:2616">
    494       <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypermedia information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 7 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 7 defines the HTTP Authentication framework.">
    495       <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypermedia information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 7 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 7 defines the HTTP Authentication framework.">
     494      <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypermedia information systems. This document defines the HTTP Authentication framework.">
     495      <meta name="description" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypermedia information systems. This document defines the HTTP Authentication framework.">
    496496   </head>
    497497   <body onload="init();">
     
    533533      <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
    534534      <p>The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypermedia information
    535          systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 7 of the
    536          seven-part specification that defines the protocol referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    537       </p> 
    538       <p>Part 7 defines the HTTP Authentication framework.</p>
     535         systems. This document defines the HTTP Authentication framework.
     536      </p>
    539537      <h1 id="rfc.note.1"><a href="#rfc.note.1">Editorial Note (To be removed by RFC Editor)</a></h1>
    540538      <p>Discussion of this draft takes place on the HTTPBIS working group mailing list (ietf-http-wg@w3.org), which is archived at &lt;<a href="http://lists.w3.org/Archives/Public/ietf-http-wg/">http://lists.w3.org/Archives/Public/ietf-http-wg/</a>&gt;.
  • draft-ietf-httpbis/20/p7-auth.xml

    r1807 r1809  
    100100<t>
    101101   The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    102    distributed, collaborative, hypermedia information systems. HTTP has been in
    103    use by the World Wide Web global information initiative since 1990. This
    104    document is Part 7 of the seven-part specification that defines the protocol
    105    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    106 </t>
    107 <t>
    108    Part 7 defines the HTTP Authentication framework.
     102   distributed, collaborative, hypermedia information systems. This document
     103   defines the HTTP Authentication framework.
    109104</t>
    110105</abstract>
  • draft-ietf-httpbis/diffs/draft-ietf-httpbis-p5-range-20-from-19.diff.html

    r1807 r1809  
    5656      <tr><td class="lineno" valign="top"></td><td class="left">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td> </td><td class="right">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td class="lineno" valign="top"></td></tr>
    5757      <tr><td class="lineno" valign="top"></td><td class="left">   protocol for distributed, collaborative, hypertext information</td><td> </td><td class="right">   protocol for distributed, collaborative, hypertext information</td><td class="lineno" valign="top"></td></tr>
    58       <tr><td class="lineno" valign="top"></td><td class="left">   systems.  HTTP has been in use by the World Wide Web global</td><td> </td><td class="right">   systems.  HTTP has been in use by the World Wide Web global</td><td class="lineno" valign="top"></td></tr>
    59       <tr><td class="lineno" valign="top"></td><td class="left">   information initiative since 1990.  This document is Part 5 of the</td><td> </td><td class="right">   information initiative since 1990.  This document is Part 5 of the</td><td class="lineno" valign="top"></td></tr>
    60       <tr><td class="lineno" valign="top"></td><td class="left">   seven-part specification that defines the protocol referred to as</td><td> </td><td class="right">   seven-part specification that defines the protocol referred to as</td><td class="lineno" valign="top"></td></tr>
    61       <tr><td class="lineno" valign="top"></td><td class="left">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td> </td><td class="right">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td class="lineno" valign="top"></td></tr>
    62       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    6358      <tr><td><a name="diff0004" /></td></tr>
    64       <tr><td class="lineno" valign="top"></td><td class="lblock">   Part 5 defines <span class="delete">range-specific</span> requests and the rules for constructing</td><td> </td><td class="rblock">   Part 5 defines <span class="insert">range</span> requests and the rules for constructing and</td><td class="lineno" valign="top"></td></tr>
    65       <tr><td class="lineno" valign="top"></td><td class="lblock">   and combining responses to those requests.</td><td> </td><td class="rblock">   combining responses to those requests.</td><td class="lineno" valign="top"></td></tr>
     59      <tr><td class="lineno" valign="top"></td><td class="lblock">   systems.  <span class="delete">HTTP has been in use by the World Wide Web global</span></td><td> </td><td class="rblock">   systems.  This document defines <span class="insert">range</span> requests and the rules for</td><td class="lineno" valign="top"></td></tr>
     60      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   information initiative since 1990.</span>  This document <span class="delete">is Part 5 of the</span></td><td> </td><td class="rblock">   constructing and combining responses to those requests.</td><td class="lineno" valign="top"></td></tr>
     61      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   seven-part specification that</span> defines <span class="delete">the protocol referred to as</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     62      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     63      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     64      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Part 5 defines range-specific</span> requests and the rules for constructing</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     65      <tr><td class="lineno" valign="top"></td><td class="lblock">   and combining responses to those requests.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    6666      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    6767      <tr><td class="lineno" valign="top"></td><td class="left">Editorial Note (To be removed by RFC Editor)</td><td> </td><td class="right">Editorial Note (To be removed by RFC Editor)</td><td class="lineno" valign="top"></td></tr>
     
    766766      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    767767      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Closed issues:</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    768       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    769       <tr><td><a name="diff0046" /></td></tr>
    770       <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/18&gt;: "Cache</span></td><td> </td><td class="rblock"><span class="insert">Appendix E.  Change Log (to</span> be <span class="insert">removed by RFC Editor before publication)</span></td><td class="lineno" valign="top"></td></tr>
     768      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     769      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/18&gt;: "Cache</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    771770      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      validators in 206 responses"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    772771      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      (&lt;http://purl.org/NET/http-errata#ifrange206&gt;)</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    852851      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   o  Fixed discrepancy in the If-Range definition about allowed</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    853852      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      validators.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    854       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    855       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/150&gt;: "multipart/</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     853      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     854      <tr><td><a name="diff0046" /></td></tr>
     855      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/150&gt;: "multipart/</span></td><td> </td><td class="rblock"><span class="insert">Appendix E.  Change Log (to</span> be <span class="insert">removed by RFC Editor before publication)</span></td><td class="lineno" valign="top"></td></tr>
    856856      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      byteranges for custom range units"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    857857      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    10521052     <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
    10531053     <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 61 change blocks.&nbsp;</a></th></tr>
    1054      <tr class="stats"><td></td><th><i>316 lines changed or deleted</i></th><th><i> </i></th><th><i>150 lines changed or added</i></th><td></td></tr>
     1054     <tr class="stats"><td></td><th><i>321 lines changed or deleted</i></th><th><i> </i></th><th><i>150 lines changed or added</i></th><td></td></tr>
    10551055     <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>
    10561056   </table>
  • draft-ietf-httpbis/diffs/draft-ietf-httpbis-p6-cache-20-from-19.diff.html

    r1807 r1809  
    5858      <tr><td class="lineno" valign="top"></td><td class="left">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td> </td><td class="right">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td class="lineno" valign="top"></td></tr>
    5959      <tr><td class="lineno" valign="top"></td><td class="left">   protocol for distributed, collaborative, hypertext information</td><td> </td><td class="right">   protocol for distributed, collaborative, hypertext information</td><td class="lineno" valign="top"></td></tr>
    60       <tr><td class="lineno" valign="top"></td><td class="left">   systems.  HTTP has been in use by the World Wide Web global</td><td> </td><td class="right">   systems.  HTTP has been in use by the World Wide Web global</td><td class="lineno" valign="top"></td></tr>
    61       <tr><td class="lineno" valign="top"></td><td class="left">   information initiative since 1990.  This document is Part 6 of the</td><td> </td><td class="right">   information initiative since 1990.  This document is Part 6 of the</td><td class="lineno" valign="top"></td></tr>
    62       <tr><td class="lineno" valign="top"></td><td class="left">   seven-part specification that defines the protocol referred to as</td><td> </td><td class="right">   seven-part specification that defines the protocol referred to as</td><td class="lineno" valign="top"></td></tr>
    63       <tr><td class="lineno" valign="top"></td><td class="left">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td> </td><td class="right">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td class="lineno" valign="top"></td></tr>
    64       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    65       <tr><td class="lineno" valign="top"></td><td class="left">   Part 6 defines requirements on HTTP caches and the associated header</td><td> </td><td class="right">   Part 6 defines requirements on HTTP caches and the associated header</td><td class="lineno" valign="top"></td></tr>
    66       <tr><td class="lineno" valign="top"></td><td class="left">   fields that control cache behavior or indicate cacheable response</td><td> </td><td class="right">   fields that control cache behavior or indicate cacheable response</td><td class="lineno" valign="top"></td></tr>
    67       <tr><td class="lineno" valign="top"></td><td class="left">   messages.</td><td> </td><td class="right">   messages.</td><td class="lineno" valign="top"></td></tr>
     60      <tr><td><a name="diff0004" /></td></tr>
     61      <tr><td class="lineno" valign="top"></td><td class="lblock">   systems.  <span class="delete">HTTP has been in use by the World Wide Web global</span></td><td> </td><td class="rblock">   systems.  This document defines requirements on HTTP caches and the</td><td class="lineno" valign="top"></td></tr>
     62      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   information initiative since 1990.</span>  This document <span class="delete">is Part 6 of the</span></td><td> </td><td class="rblock">   associated header fields that control cache behavior or indicate</td><td class="lineno" valign="top"></td></tr>
     63      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   seven-part specification that defines the protocol referred to as</span></td><td> </td><td class="rblock">   cacheable response messages.</td><td class="lineno" valign="top"></td></tr>
     64      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     65      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     66      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Part 6</span> defines requirements on HTTP caches and the associated header</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     67      <tr><td class="lineno" valign="top"></td><td class="lblock">   fields that control cache behavior or indicate cacheable response</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     68      <tr><td class="lineno" valign="top"></td><td class="lblock">   messages.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    6869      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    6970      <tr><td class="lineno" valign="top"></td><td class="left">Editorial Note (To be removed by RFC Editor)</td><td> </td><td class="right">Editorial Note (To be removed by RFC Editor)</td><td class="lineno" valign="top"></td></tr>
    7071      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    71       <tr><td><a name="diff0004" /></td></tr>
     72      <tr><td><a name="diff0005" /></td></tr>
    7273      <tr><td class="lineno" valign="top"></td><td class="lblock">   Discussion of this draft <span class="delete">should take</span> place on the HTTPBIS working</td><td> </td><td class="rblock">   Discussion of this draft <span class="insert">takes</span> place on the HTTPBIS working group</td><td class="lineno" valign="top"></td></tr>
    7374      <tr><td class="lineno" valign="top"></td><td class="lblock">   group mailing list (ietf-http-wg@w3.org), which is archived at</td><td> </td><td class="rblock">   mailing list (ietf-http-wg@w3.org), which is archived at</td><td class="lineno" valign="top"></td></tr>
     
    7980      <tr><td class="lineno" valign="top"></td><td class="left">   &lt;http://tools.ietf.org/wg/httpbis/&gt;.</td><td> </td><td class="right">   &lt;http://tools.ietf.org/wg/httpbis/&gt;.</td><td class="lineno" valign="top"></td></tr>
    8081      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    81       <tr><td><a name="diff0005" /></td></tr>
     82      <tr><td><a name="diff0006" /></td></tr>
    8283      <tr><td class="lineno" valign="top"></td><td class="lblock">   The changes in this draft are summarized in Appendix <span class="delete">C.20</span>.</td><td> </td><td class="rblock">   The changes in this draft are summarized in Appendix <span class="insert">D.1</span>.</td><td class="lineno" valign="top"></td></tr>
    8384      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    9798      <tr><td class="lineno" valign="top"></td><td class="left">   material or to cite them other than as "work in progress."</td><td> </td><td class="right">   material or to cite them other than as "work in progress."</td><td class="lineno" valign="top"></td></tr>
    9899      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    99       <tr><td><a name="diff0006" /></td></tr>
     100      <tr><td><a name="diff0007" /></td></tr>
    100101      <tr><td class="lineno" valign="top"></td><td class="lblock">   This Internet-Draft will expire on <span class="delete">September 13, 2012</span>.</td><td> </td><td class="rblock">   This Internet-Draft will expire on <span class="insert">January 17, 2013</span>.</td><td class="lineno" valign="top"></td></tr>
    101102      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    110111      <tr><td class="lineno" valign="top"></td><td class="left">   publication of this document.  Please review these documents</td><td> </td><td class="right">   publication of this document.  Please review these documents</td><td class="lineno" valign="top"></td></tr>
    111112      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    112       <tr bgcolor="gray" ><td></td><th><a name="part-l2" /><small>skipping to change at</small><em> page 2, line 42</em></th><th> </th><th><a name="part-r2" /><small>skipping to change at</small><em> page 2, line 42</em></th><td></td></tr>
     113      <tr bgcolor="gray" ><td></td><th><a name="part-l2" /><small>skipping to change at</small><em> page 2, line 42</em></th><th> </th><th><a name="part-r2" /><small>skipping to change at</small><em> page 2, line 37</em></th><td></td></tr>
    113114      <tr><td class="lineno" valign="top"></td><td class="left">   modifications of such material outside the IETF Standards Process.</td><td> </td><td class="right">   modifications of such material outside the IETF Standards Process.</td><td class="lineno" valign="top"></td></tr>
    114115      <tr><td class="lineno" valign="top"></td><td class="left">   Without obtaining an adequate license from the person(s) controlling</td><td> </td><td class="right">   Without obtaining an adequate license from the person(s) controlling</td><td class="lineno" valign="top"></td></tr>
     
    121122      <tr><td class="lineno" valign="top"></td><td class="left">Table of Contents</td><td> </td><td class="right">Table of Contents</td><td class="lineno" valign="top"></td></tr>
    122123      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    123       <tr><td><a name="diff0007" /></td></tr>
     124      <tr><td><a name="diff0008" /></td></tr>
    124125      <tr><td class="lineno" valign="top"></td><td class="lblock">   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  <span class="delete">5</span></td><td> </td><td class="rblock">   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  <span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
    125126      <tr><td class="lineno" valign="top"></td><td class="lblock">     1.1.  Purpose  . . . . . . . . . . . . . . . . . . . . . . . . .  <span class="delete">5</span></td><td> </td><td class="rblock">     1.1.  Purpose  . . . . . . . . . . . . . . . . . . . . . . . . .  <span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
     
    127128      <tr><td class="lineno" valign="top"></td><td class="lblock">     1.3.  Conformance and Error Handling . . . . . . . . . . . . . .  <span class="delete">7</span></td><td> </td><td class="rblock">     1.3.  Conformance and Error Handling . . . . . . . . . . . . . .  <span class="insert">6</span></td><td class="lineno" valign="top"></td></tr>
    128129      <tr><td class="lineno" valign="top"></td><td class="left">     1.4.  Syntax Notation  . . . . . . . . . . . . . . . . . . . . .  7</td><td> </td><td class="right">     1.4.  Syntax Notation  . . . . . . . . . . . . . . . . . . . . .  7</td><td class="lineno" valign="top"></td></tr>
    129       <tr><td><a name="diff0008" /></td></tr>
     130      <tr><td><a name="diff0009" /></td></tr>
    130131      <tr><td class="lineno" valign="top"></td><td class="lblock">       1.4.1.  <span class="delete">Core Rules . .</span> . . . . . . . . . . . . . . . . . . . .  <span class="delete">8</span></td><td> </td><td class="rblock">       1.4.1.  <span class="insert">Delta Seconds</span>  . . . . . . . . . . . . . . . . . . . .  <span class="insert">7</span></td><td class="lineno" valign="top"></td></tr>
    131132      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       1.4.2.  ABNF Rules defined in other Parts</span> of <span class="delete">the</span></td><td> </td><td class="rblock"><span class="insert">   2.  Overview</span> of <span class="insert">Cache Operation</span>  . . . . . . . . . . . . . . . . .  <span class="insert">7</span></td><td class="lineno" valign="top"></td></tr>
     
    133134      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     1.5.  Delta Seconds  . .</span> . . . . . . . . . . . . . . . . . . . .  8</td><td> </td><td class="rblock">     <span class="insert">3.1.  Storing Incomplete Responses</span> . . . . . . . . . . . . . . .  <span class="insert">9</span></td><td class="lineno" valign="top"></td></tr>
    134135      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">2.  Cache Operation  . . . . .</span> . . . . . . . . . . . . . . . . . .  <span class="delete">8</span></td><td> </td><td class="rblock"><span class="insert">     3.2.  Storing Responses to Authenticated Requests</span>  . . . . . . .  <span class="insert">9</span></td><td class="lineno" valign="top"></td></tr>
    135       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.1.  Response Cacheability</span>  . . . . . . . . . . . . . . . . . .  <span class="delete">9</span></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
    136       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.2.  Constructing Responses from Caches</span> . . . . . . . . . . . . <span class="delete">10</span></td><td> </td><td class="rblock"><span class="insert">   4.  Constructing Responses from Caches</span> . . . . . . . . . . . . . . <span class="insert">10</span></td><td class="lineno" valign="top"></td></tr>
    137       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.3.  Freshness Model</span>  . . . . . . . . . . . . . . . . . . . . . 12</td><td> </td><td class="rblock"><span class="insert">     4.1.  Freshness Model</span>  . . . . . . . . . . . . . . . . . . . . . <span class="insert">11</span></td><td class="lineno" valign="top"></td></tr>
    138       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">2.3.1.</span>  Calculating Freshness <span class="delete">Lifetime</span> . . . . . . . . . . . <span class="delete">. 13</span></td><td> </td><td class="rblock"><span class="insert">       4.1.1.  Calculating Freshness Lifetime</span> . . . . . . . . . . . . 12</td><td class="lineno" valign="top"></td></tr>
    139       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       2.3.2.</span>  Calculating Age  . . . . . . . . . . . . . . . . . . . <span class="delete">14</span></td><td> </td><td class="rblock">       <span class="insert">4.1.2.</span>  Calculating <span class="insert">Heuristic</span> Freshness  . . . . . . . . . . . <span class="insert">12</span></td><td class="lineno" valign="top"></td></tr>
    140       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       2.3.3.</span>  Serving Stale Responses  . . . . . . . . . . . . . . . <span class="delete">16</span></td><td> </td><td class="rblock"><span class="insert">       4.1.3.</span>  Calculating Age  . . . . . . . . . . . . . . . . . . . <span class="insert">13</span></td><td class="lineno" valign="top"></td></tr>
    141       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.4.</span>  Validation Model . . . . . . . . . . . . . . . . . . . . . 16</td><td> </td><td class="rblock"><span class="insert">       4.1.4.</span>  Serving Stale Responses  . . . . . . . . . . . . . . . <span class="insert">15</span></td><td class="lineno" valign="top"></td></tr>
    142       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">2.4.1.</span>  Freshening Responses with 304 Not Modified . . . . . . <span class="delete">17</span></td><td> </td><td class="rblock"><span class="insert">     4.2.</span>  Validation Model . . . . . . . . . . . . . . . . . . . . . 16</td><td class="lineno" valign="top"></td></tr>
    143       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.5.  Updating Caches with HEAD</span> Responses  . . . . . . . . . . . <span class="delete">18</span></td><td> </td><td class="rblock">       <span class="insert">4.2.1.</span>  Freshening Responses with 304 Not Modified . . . . . . <span class="insert">16</span></td><td class="lineno" valign="top"></td></tr>
    144       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.6.  Request Methods that Invalidate</span>  . . . . . . . . . . . . . <span class="delete">18</span></td><td> </td><td class="rblock"><span class="insert">     4.3.  Using Negotiated</span> Responses . . . . . . . . . . . . . . . . <span class="insert">17</span></td><td class="lineno" valign="top"></td></tr>
    145       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.7.  Shared Caching of Authenticated Responses</span>  . . . . . . . . <span class="delete">19</span></td><td> </td><td class="rblock"><span class="insert">     4.4.  Combining Partial Content</span>  . . . . . . . . . . . . . . . . <span class="insert">18</span></td><td class="lineno" valign="top"></td></tr>
    146       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.8.  Caching Negotiated</span> Responses . . . . . . . . . . . . . <span class="delete">. .</span> 19</td><td> </td><td class="rblock"><span class="insert">   5.  Updating Caches with HEAD</span> Responses  . . . . . . . . . . . . . 19</td><td class="lineno" valign="top"></td></tr>
    147       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">2.9.  Combining Partial Content  .</span> . . . . . . . . . . . . . . . <span class="delete">20</span></td><td> </td><td class="rblock">   <span class="insert">6.  Request Methods that Invalidate</span>  . . . . . . . . . . . . . . . <span class="insert">19</span></td><td class="lineno" valign="top"></td></tr>
    148       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   3.</span>  Header Field Definitions . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">   7.</span>  Header Field Definitions . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    149       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.1.</span>  Age  . . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">     7.1.</span>  Age  . . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    150       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.2.</span>  Cache-Control  . . . . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">     7.2.</span>  Cache-Control  . . . . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    151       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.1.</span>  Request Cache-Control Directives . . . . . . . . . . . <span class="delete">22</span></td><td> </td><td class="rblock"><span class="insert">       7.2.1.</span>  Request Cache-Control Directives . . . . . . . . . . . <span class="insert">21</span></td><td class="lineno" valign="top"></td></tr>
    152       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.2.</span>  Response Cache-Control Directives  . . . . . . . . . . <span class="delete">24</span></td><td> </td><td class="rblock"><span class="insert">       7.2.2.</span>  Response Cache-Control Directives  . . . . . . . . . . <span class="insert">23</span></td><td class="lineno" valign="top"></td></tr>
    153       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.3.</span>  Cache Control Extensions . . . . . . . . . . . . . . . 26</td><td> </td><td class="rblock"><span class="insert">       7.2.3.</span>  Cache Control Extensions . . . . . . . . . . . . . . . 26</td><td class="lineno" valign="top"></td></tr>
    154       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.3.</span>  Expires  . . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">27</span></td><td> </td><td class="rblock">     <span class="insert">7.3.</span>  Expires  . . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">28</span></td><td class="lineno" valign="top"></td></tr>
    155       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.4.</span>  Pragma . . . . . . . . . . . . . . . . . . . . . . . . . . 28</td><td> </td><td class="rblock"><span class="insert">     7.4.</span>  Pragma . . . . . . . . . . . . . . . . . . . . . . . . . . 28</td><td class="lineno" valign="top"></td></tr>
    156       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.5.</span>  Vary . . . . . . . . . . . . . . . . . . . . . . . . . . . 29</td><td> </td><td class="rblock">     <span class="insert">7.5.</span>  Vary . . . . . . . . . . . . . . . . . . . . . . . . . . . 29</td><td class="lineno" valign="top"></td></tr>
    157       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.6.</span>  Warning  . . . . . . . . . . . . . . . . . . . . . . . . . 30</td><td> </td><td class="rblock">     <span class="insert">7.6.</span>  Warning  . . . . . . . . . . . . . . . . . . . . . . . . . 30</td><td class="lineno" valign="top"></td></tr>
    158       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.1.</span>  110 Response is Stale  . . . . . . . . . . . . . . . . 31</td><td> </td><td class="rblock">       <span class="insert">7.6.1.</span>  110 Response is Stale  . . . . . . . . . . . . . . . . 31</td><td class="lineno" valign="top"></td></tr>
    159       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.2.</span>  111 Revalidation Failed  . . . . . . . . . . . . . . . <span class="delete">31</span></td><td> </td><td class="rblock">       <span class="insert">7.6.2.</span>  111 Revalidation Failed  . . . . . . . . . . . . . . . <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
    160       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.6.3.</span>  112 Disconnected Operation . . . . . . . . . . . . . . <span class="delete">31</span></td><td> </td><td class="rblock"><span class="insert">       7.6.3.</span>  112 Disconnected Operation . . . . . . . . . . . . . . <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
    161       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.6.4.</span>  113 Heuristic Expiration . . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock"><span class="insert">       7.6.4.</span>  113 Heuristic Expiration . . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
    162       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.5.</span>  199 Miscellaneous Warning  . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.5.</span>  199 Miscellaneous Warning . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
    163       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.6.</span>  214 Transformation Applied . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.6.</span>  214 Transformation Applied . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
    164       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.7.</span>  299 Miscellaneous Persistent Warning . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.7.</span>  299 Miscellaneous Persistent Warning . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
    165       <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.8.</span>  Warn Code Extensions . . . . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.8.</span>  Warn Code Extensions . . . . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
    166       <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">4.</span>  History Lists  . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">32</span></td><td> </td><td class="rblock">   <span class="insert">8.</span>  History Lists  . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">33</span></td><td class="lineno" valign="top"></td></tr>
    167       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   5.</span>  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 33</td><td> </td><td class="rblock"><span class="insert">   9.</span>  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 33</td><td class="lineno" valign="top"></td></tr>
    168       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">5.1.</span>  Cache Directive Registry . . . . . . . . . . . . . . . . . 33</td><td> </td><td class="rblock">     <span class="insert">9.1.</span>  Cache Directive Registry . . . . . . . . . . . . . . . . . 33</td><td class="lineno" valign="top"></td></tr>
    169       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">5.2.</span>  Warn Code Registry . . . . . . . . . . . . . . . . . . . . <span class="delete">33</span></td><td> </td><td class="rblock">     <span class="insert">9.2.</span>  Warn Code Registry . . . . . . . . . . . . . . . . . . . . <span class="insert">34</span></td><td class="lineno" valign="top"></td></tr>
    170       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     5.3.</span>  Header Field Registration  . . . . . . . . . . . . . . . . 34</td><td> </td><td class="rblock"><span class="insert">     9.3.</span>  Header Field Registration  . . . . . . . . . . . . . . . . 34</td><td class="lineno" valign="top"></td></tr>
    171       <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">6.</span>  Security Considerations  . . . . . . . . . . . . . . . . . . . <span class="delete">34</span></td><td> </td><td class="rblock">   <span class="insert">10.</span> Security Considerations . . . . . . . . . . . . . . . . . . . <span class="insert">35</span></td><td class="lineno" valign="top"></td></tr>
    172       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   7.</span>  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">34</span></td><td> </td><td class="rblock"><span class="insert">   11.</span> Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">35</span></td><td class="lineno" valign="top"></td></tr>
    173       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   8.</span>  References . . . . . . . . . . . . . . . . . . . . . . . . . . 35</td><td> </td><td class="rblock"><span class="insert">   12.</span> References . . . . . . . . . . . . . . . . . . . . . . . . . . 35</td><td class="lineno" valign="top"></td></tr>
    174       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">8.1.</span>  Normative References . . . . . . . . . . . . . . . . . . . 35</td><td> </td><td class="rblock">     <span class="insert">12.1.</span> Normative References . . . . . . . . . . . . . . . . . . . 35</td><td class="lineno" valign="top"></td></tr>
    175       <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">8.2.</span>  Informative References . . . . . . . . . . . . . . . . . . <span class="delete">35</span></td><td> </td><td class="rblock">     <span class="insert">12.2.</span> Informative References . . . . . . . . . . . . . . . . . . <span class="insert">36</span></td><td class="lineno" valign="top"></td></tr>
     136      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.1.  Response Cacheability</span>  . . . . . . . . . . . . . . . . . .  <span class="delete">9</span></td><td> </td><td class="rblock"><span class="insert">   4.  Constructing Responses from Caches</span> . . . . . . . . . . . . . . <span class="insert">10</span></td><td class="lineno" valign="top"></td></tr>
     137      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.2.  Constructing Responses from Caches</span> . . . . . . . . . . . . <span class="delete">10</span></td><td> </td><td class="rblock"><span class="insert">     4.1.  Freshness Model</span>  . . . . . . . . . . . . . . . . . . . . . <span class="insert">11</span></td><td class="lineno" valign="top"></td></tr>
     138      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.3.  Freshness Model</span>  . . . . . . . . . . . . . . . . . . . . . 12</td><td> </td><td class="rblock"><span class="insert">       4.1.1.  Calculating Freshness Lifetime</span> . . . . . . . . . . . . 12</td><td class="lineno" valign="top"></td></tr>
     139      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">2.3.1.</span>  Calculating Freshness <span class="delete">Lifetime</span> . . . . . . . . . . . <span class="delete">. 13</span></td><td> </td><td class="rblock">       <span class="insert">4.1.2.</span>  Calculating <span class="insert">Heuristic</span> Freshness  . . . . . . . . . . . <span class="insert">12</span></td><td class="lineno" valign="top"></td></tr>
     140      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       2.3.2.</span>  Calculating Age  . . . . . . . . . . . . . . . . . . . <span class="delete">14</span></td><td> </td><td class="rblock"><span class="insert">       4.1.3.</span>  Calculating Age  . . . . . . . . . . . . . . . . . . . <span class="insert">13</span></td><td class="lineno" valign="top"></td></tr>
     141      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       2.3.3.</span>  Serving Stale Responses  . . . . . . . . . . . . . . . <span class="delete">16</span></td><td> </td><td class="rblock"><span class="insert">       4.1.4.</span>  Serving Stale Responses  . . . . . . . . . . . . . . . <span class="insert">15</span></td><td class="lineno" valign="top"></td></tr>
     142      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.4.</span>  Validation Model . . . . . . . . . . . . . . . . . . . . . 16</td><td> </td><td class="rblock"><span class="insert">     4.2.</span>  Validation Model . . . . . . . . . . . . . . . . . . . . . 16</td><td class="lineno" valign="top"></td></tr>
     143      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">2.4.1.</span>  Freshening Responses with 304 Not Modified . . . . . . <span class="delete">17</span></td><td> </td><td class="rblock">       <span class="insert">4.2.1.</span>  Freshening Responses with 304 Not Modified . . . . . . <span class="insert">16</span></td><td class="lineno" valign="top"></td></tr>
     144      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.5.  Updating Caches with HEAD</span> Responses  . . . . . . . . . . . <span class="delete">18</span></td><td> </td><td class="rblock"><span class="insert">     4.3.  Using Negotiated</span> Responses . . . . . . . . . . . . . . . . <span class="insert">17</span></td><td class="lineno" valign="top"></td></tr>
     145      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.6.  Request Methods that Invalidate</span>  . . . . . . . . . . . . . <span class="delete">18</span></td><td> </td><td class="rblock"><span class="insert">     4.4.  Combining Partial Content</span>  . . . . . . . . . . . . . . . . <span class="insert">18</span></td><td class="lineno" valign="top"></td></tr>
     146      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.7.  Shared Caching of Authenticated Responses</span>  . . . . . . . . <span class="delete">19</span></td><td> </td><td class="rblock"><span class="insert">   5.  Updating Caches with HEAD</span> Responses  . . . . . . . . . . . . . 19</td><td class="lineno" valign="top"></td></tr>
     147      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     2.8.  Caching Negotiated</span> Responses . . . . . . . . . . . . . <span class="delete">. .</span> 19</td><td> </td><td class="rblock">   <span class="insert">6.  Request Methods that Invalidate</span>  . . . . . . . . . . . . . . . <span class="insert">19</span></td><td class="lineno" valign="top"></td></tr>
     148      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">2.9.  Combining Partial Content  .</span> . . . . . . . . . . . . . . . <span class="delete">20</span></td><td> </td><td class="rblock"><span class="insert">   7.</span>  Header Field Definitions . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
     149      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   3.</span>  Header Field Definitions . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">     7.1.</span>  Age  . . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
     150      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.1.</span>  Age  . . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">     7.2.</span>  Cache-Control . . . . . . . . . . . . . . . . . . . . . . <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
     151      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.2.</span>  Cache-Control  . . . . . . . . . . . . . . . . . . . . . . <span class="delete">21</span></td><td> </td><td class="rblock"><span class="insert">       7.2.1.</span>  Request Cache-Control Directives . . . . . . . . . . . <span class="insert">21</span></td><td class="lineno" valign="top"></td></tr>
     152      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.1.</span>  Request Cache-Control Directives . . . . . . . . . . . <span class="delete">22</span></td><td> </td><td class="rblock"><span class="insert">       7.2.2.</span>  Response Cache-Control Directives  . . . . . . . . . . <span class="insert">23</span></td><td class="lineno" valign="top"></td></tr>
     153      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.2.</span>  Response Cache-Control Directives  . . . . . . . . . . <span class="delete">24</span></td><td> </td><td class="rblock"><span class="insert">       7.2.3.</span>  Cache Control Extensions . . . . . . . . . . . . . . . 26</td><td class="lineno" valign="top"></td></tr>
     154      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.2.3.</span>  Cache Control Extensions . . . . . . . . . . . . . . . 26</td><td> </td><td class="rblock">     <span class="insert">7.3.</span>  Expires  . . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">28</span></td><td class="lineno" valign="top"></td></tr>
     155      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.3.</span>  Expires  . . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">27</span></td><td> </td><td class="rblock"><span class="insert">     7.4.</span>  Pragma . . . . . . . . . . . . . . . . . . . . . . . . . . 28</td><td class="lineno" valign="top"></td></tr>
     156      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     3.4.</span>  Pragma . . . . . . . . . . . . . . . . . . . . . . . . . . 28</td><td> </td><td class="rblock">     <span class="insert">7.5.</span>  Vary . . . . . . . . . . . . . . . . . . . . . . . . . . . 29</td><td class="lineno" valign="top"></td></tr>
     157      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.5.</span>  Vary . . . . . . . . . . . . . . . . . . . . . . . . . . . 29</td><td> </td><td class="rblock">     <span class="insert">7.6.</span>  Warning  . . . . . . . . . . . . . . . . . . . . . . . . . 30</td><td class="lineno" valign="top"></td></tr>
     158      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">3.6.</span>  Warning  . . . . . . . . . . . . . . . . . . . . . . . . . 30</td><td> </td><td class="rblock">       <span class="insert">7.6.1.</span>  110 Response is Stale  . . . . . . . . . . . . . . . . 31</td><td class="lineno" valign="top"></td></tr>
     159      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.1.</span>  110 Response is Stale  . . . . . . . . . . . . . . . . 31</td><td> </td><td class="rblock">       <span class="insert">7.6.2.</span>  111 Revalidation Failed  . . . . . . . . . . . . . . . <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
     160      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.2.</span>  111 Revalidation Failed  . . . . . . . . . . . . . . . <span class="delete">31</span></td><td> </td><td class="rblock"><span class="insert">       7.6.3.</span>  112 Disconnected Operation . . . . . . . . . . . . . . <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
     161      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.6.3.</span>  112 Disconnected Operation . . . . . . . . . . . . . . <span class="delete">31</span></td><td> </td><td class="rblock"><span class="insert">       7.6.4.</span>  113 Heuristic Expiration . . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
     162      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       3.6.4.</span>  113 Heuristic Expiration . . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.5.</span>  199 Miscellaneous Warning . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
     163      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.5.</span>  199 Miscellaneous Warning  . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.6.</span>  214 Transformation Applied . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
     164      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.6.</span>  214 Transformation Applied . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.7.</span>  299 Miscellaneous Persistent Warning . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
     165      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.7.</span>  299 Miscellaneous Persistent Warning . . . . . . . . . 32</td><td> </td><td class="rblock">       <span class="insert">7.6.8.</span>  Warn Code Extensions . . . . . . . . . . . . . . . . . 32</td><td class="lineno" valign="top"></td></tr>
     166      <tr><td class="lineno" valign="top"></td><td class="lblock">       <span class="delete">3.6.8.</span>  Warn Code Extensions . . . . . . . . . . . . . . . . . 32</td><td> </td><td class="rblock">   <span class="insert">8.</span>  History Lists  . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">33</span></td><td class="lineno" valign="top"></td></tr>
     167      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">4.</span>  History Lists  . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">32</span></td><td> </td><td class="rblock"><span class="insert">   9.</span>  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 33</td><td class="lineno" valign="top"></td></tr>
     168      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   5.</span>  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 33</td><td> </td><td class="rblock">     <span class="insert">9.1.</span>  Cache Directive Registry . . . . . . . . . . . . . . . . . 33</td><td class="lineno" valign="top"></td></tr>
     169      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">5.1.</span>  Cache Directive Registry . . . . . . . . . . . . . . . . . 33</td><td> </td><td class="rblock">     <span class="insert">9.2.</span>  Warn Code Registry . . . . . . . . . . . . . . . . . . . . <span class="insert">34</span></td><td class="lineno" valign="top"></td></tr>
     170      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">5.2.</span>  Warn Code Registry . . . . . . . . . . . . . . . . . . . . <span class="delete">33</span></td><td> </td><td class="rblock"><span class="insert">     9.3.</span>  Header Field Registration  . . . . . . . . . . . . . . . . 34</td><td class="lineno" valign="top"></td></tr>
     171      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     5.3.</span>  Header Field Registration  . . . . . . . . . . . . . . . . 34</td><td> </td><td class="rblock">   <span class="insert">10.</span> Security Considerations  . . . . . . . . . . . . . . . . . . . <span class="insert">35</span></td><td class="lineno" valign="top"></td></tr>
     172      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">6.</span>  Security Considerations  . . . . . . . . . . . . . . . . . . . <span class="delete">34</span></td><td> </td><td class="rblock"><span class="insert">   11.</span> Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">35</span></td><td class="lineno" valign="top"></td></tr>
     173      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   7.</span>  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">34</span></td><td> </td><td class="rblock"><span class="insert">   12.</span> References . . . . . . . . . . . . . . . . . . . . . . . . . . 35</td><td class="lineno" valign="top"></td></tr>
     174      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   8.</span>  References . . . . . . . . . . . . . . . . . . . . . . . . . . 35</td><td> </td><td class="rblock">     <span class="insert">12.1.</span> Normative References . . . . . . . . . . . . . . . . . . . 35</td><td class="lineno" valign="top"></td></tr>
     175      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">8.1.</span>  Normative References . . . . . . . . . . . . . . . . . . . 35</td><td> </td><td class="rblock">     <span class="insert">12.2.</span> Informative References . . . . . . . . . . . . . . . . . . <span class="insert">36</span></td><td class="lineno" valign="top"></td></tr>
     176      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">8.2.</span>  Informative References . . . . . . . . . . . . . . . . . . <span class="delete">35</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    176177      <tr><td class="lineno" valign="top"></td><td class="left">   Appendix A.  Changes from RFC 2616 . . . . . . . . . . . . . . . . 36</td><td> </td><td class="right">   Appendix A.  Changes from RFC 2616 . . . . . . . . . . . . . . . . 36</td><td class="lineno" valign="top"></td></tr>
    177       <tr><td><a name="diff0009" /></td></tr>
     178      <tr><td><a name="diff0010" /></td></tr>
    178179      <tr><td class="lineno" valign="top"></td><td class="lblock">   Appendix B.  <span class="delete">Collected</span> ABNF  . . . . . . . . . . . . . . . . . . . <span class="delete">36</span></td><td> </td><td class="rblock">   Appendix B.  <span class="insert">Imported</span> ABNF . . . . . . . . . . . . . . . . . . . . 37</td><td class="lineno" valign="top"></td></tr>
    179180      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Appendix C.  Change Log (to be removed by RFC Editor before</span></td><td> </td><td class="rblock">   <span class="insert">Appendix C.  Collected ABNF</span>  . . . . . . . . . . . . . . . . . . . 38</td><td class="lineno" valign="top"></td></tr>
     
    220221      <tr><td class="lineno" valign="top"></td><td class="left">   performance by reusing a prior response message to satisfy a current</td><td> </td><td class="right">   performance by reusing a prior response message to satisfy a current</td><td class="lineno" valign="top"></td></tr>
    221222      <tr><td class="lineno" valign="top"></td><td class="left">   request.  A stored response is considered "fresh", as defined in</td><td> </td><td class="right">   request.  A stored response is considered "fresh", as defined in</td><td class="lineno" valign="top"></td></tr>
    222       <tr><td><a name="diff0010" /></td></tr>
     223      <tr><td><a name="diff0011" /></td></tr>
    223224      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">2.3</span>, if the response can be reused without "validation"</td><td> </td><td class="rblock">   Section <span class="insert">4.1</span>, if the response can be reused without "validation"</td><td class="lineno" valign="top"></td></tr>
    224225      <tr><td class="lineno" valign="top"></td><td class="left">   (checking with the origin server to see if the cached response</td><td> </td><td class="right">   (checking with the origin server to see if the cached response</td><td class="lineno" valign="top"></td></tr>
     
    226227      <tr><td class="lineno" valign="top"></td><td class="left">   therefore reduce both latency and network transfers each time it is</td><td> </td><td class="right">   therefore reduce both latency and network transfers each time it is</td><td class="lineno" valign="top"></td></tr>
    227228      <tr><td class="lineno" valign="top"></td><td class="left">   reused.  When a cached response is not fresh, it might still be</td><td> </td><td class="right">   reused.  When a cached response is not fresh, it might still be</td><td class="lineno" valign="top"></td></tr>
    228       <tr><td><a name="diff0011" /></td></tr>
     229      <tr><td><a name="diff0012" /></td></tr>
    229230      <tr><td class="lineno" valign="top"></td><td class="lblock">   reusable if it can be freshened by validation (Section <span class="delete">2.4</span>) or if the</td><td> </td><td class="rblock">   reusable if it can be freshened by validation (Section <span class="insert">4.2</span>) or if the</td><td class="lineno" valign="top"></td></tr>
    230231      <tr><td class="lineno" valign="top"></td><td class="left">   origin is unavailable.</td><td> </td><td class="right">   origin is unavailable.</td><td class="lineno" valign="top"></td></tr>
     
    250251      <tr><td class="lineno" valign="top"></td><td class="left">   document are to be interpreted as described in [RFC2119].</td><td> </td><td class="right">   document are to be interpreted as described in [RFC2119].</td><td class="lineno" valign="top"></td></tr>
    251252      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    252       <tr><td><a name="diff0012" /></td></tr>
     253      <tr><td><a name="diff0013" /></td></tr>
    253254      <tr><td class="lineno" valign="top"></td><td class="lblock">   This <span class="delete">document defines</span> conformance criteria <span class="delete">for several roles</span> in HTTP</td><td> </td><td class="rblock">   This <span class="insert">specification targets</span> conformance criteria <span class="insert">according to the role</span></td><td class="lineno" valign="top"></td></tr>
    254255      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">communication, including Senders, Recipients, Clients, Servers, User-</span></td><td> </td><td class="rblock"><span class="insert">   of a participant</span> in HTTP <span class="insert">communication.  Hence, HTTP requirements are</span></td><td class="lineno" valign="top"></td></tr>
     
    263264      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    264265      <tr><td class="lineno" valign="top"></td><td class="left">   An implementation is considered conformant if it complies with all of</td><td> </td><td class="right">   An implementation is considered conformant if it complies with all of</td><td class="lineno" valign="top"></td></tr>
    265       <tr><td><a name="diff0013" /></td></tr>
     266      <tr><td><a name="diff0014" /></td></tr>
    266267      <tr><td class="lineno" valign="top"></td><td class="lblock">   the requirements associated with <span class="delete">its role(s).</span>  Note that SHOULD-level</td><td> </td><td class="rblock">   the requirements associated with <span class="insert">the roles it partakes in HTTP.</span>  Note</td><td class="lineno" valign="top"></td></tr>
    267268      <tr><td class="lineno" valign="top"></td><td class="lblock">   requirements are relevant here, unless one of the documented</td><td> </td><td class="rblock">   that SHOULD-level requirements are relevant here, unless one of the</td><td class="lineno" valign="top"></td></tr>
     
    270271      <tr><td class="lineno" valign="top"></td><td class="left">   This document also uses ABNF to define valid protocol elements</td><td> </td><td class="right">   This document also uses ABNF to define valid protocol elements</td><td class="lineno" valign="top"></td></tr>
    271272      <tr><td class="lineno" valign="top"></td><td class="left">   (Section 1.4).  In addition to the prose requirements placed upon</td><td> </td><td class="right">   (Section 1.4).  In addition to the prose requirements placed upon</td><td class="lineno" valign="top"></td></tr>
    272       <tr><td><a name="diff0014" /></td></tr>
     273      <tr><td><a name="diff0015" /></td></tr>
    273274      <tr><td class="lineno" valign="top"></td><td class="lblock">   them, <span class="delete">Senders</span> MUST NOT generate protocol elements that are <span class="delete">invalid.</span></td><td> </td><td class="rblock">   them, <span class="insert">senders</span> MUST NOT generate protocol elements that <span class="insert">do not match</span></td><td class="lineno" valign="top"></td></tr>
    274275      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   the grammar defined by the ABNF rules for those protocol elements</span></td><td class="lineno" valign="top"></td></tr>
     
    278279      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   only those rules not applicable to the recipient's role.</span></td><td class="lineno" valign="top"></td></tr>
    279280      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    280       <tr><td><a name="diff0015" /></td></tr>
     281      <tr><td><a name="diff0016" /></td></tr>
    281282      <tr><td class="lineno" valign="top"></td><td class="lblock">   Unless noted otherwise, <span class="delete">Recipients</span> MAY <span class="delete">take steps</span> to recover a usable</td><td> </td><td class="rblock">   Unless noted otherwise, <span class="insert">a recipient</span> MAY <span class="insert">attempt</span> to recover a usable</td><td class="lineno" valign="top"></td></tr>
    282283      <tr><td class="lineno" valign="top"></td><td class="lblock">   protocol element from an invalid construct.  <span class="delete">However,</span> HTTP does not</td><td> </td><td class="rblock">   protocol element from an invalid construct.  HTTP does not define</td><td class="lineno" valign="top"></td></tr>
     
    293294      <tr><td class="lineno" valign="top"></td><td class="left">   This specification uses the Augmented Backus-Naur Form (ABNF)</td><td> </td><td class="right">   This specification uses the Augmented Backus-Naur Form (ABNF)</td><td class="lineno" valign="top"></td></tr>
    294295      <tr><td class="lineno" valign="top"></td><td class="left">   notation of [RFC5234] with the list rule extension defined in Section</td><td> </td><td class="right">   notation of [RFC5234] with the list rule extension defined in Section</td><td class="lineno" valign="top"></td></tr>
    295       <tr><td><a name="diff0016" /></td></tr>
     296      <tr><td><a name="diff0017" /></td></tr>
    296297      <tr><td class="lineno" valign="top"></td><td class="lblock">   1.2 of [Part1].  Appendix B shows the collected ABNF with the list</td><td> </td><td class="rblock">   1.2 of [Part1].  Appendix B <span class="insert">describes rules imported from other</span></td><td class="lineno" valign="top"></td></tr>
    297298      <tr><td class="lineno" valign="top"></td><td class="lblock">   rule expanded.</td><td> </td><td class="rblock"><span class="insert">   documents.  Appendix C</span> shows the collected ABNF with the list rule</td><td class="lineno" valign="top"></td></tr>
     
    322323      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     uri-host      = &lt;uri-host, defined in [Part1], Section 2.7&gt;</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    323324      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    324       <tr><td><a name="diff0017" /></td></tr>
     325      <tr><td><a name="diff0018" /></td></tr>
    325326      <tr><td class="lineno" valign="top"></td><td class="lblock">1.<span class="delete">5</span>.  Delta Seconds</td><td> </td><td class="rblock">1.<span class="insert">4.1</span>.  Delta Seconds</td><td class="lineno" valign="top"></td></tr>
    326327      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    337338      <tr><td class="lineno" valign="top"></td><td class="left">   send delta-seconds with a value greater than 2147483648.</td><td> </td><td class="right">   send delta-seconds with a value greater than 2147483648.</td><td class="lineno" valign="top"></td></tr>
    338339      <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="diff0018" /></td></tr>
     340      <tr><td><a name="diff0019" /></td></tr>
    340341      <tr><td class="lineno" valign="top"></td><td class="lblock">2.  Cache Operation</td><td> </td><td class="rblock">2.  <span class="insert">Overview of </span>Cache Operation</td><td class="lineno" valign="top"></td></tr>
    341342      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    354355      <tr><td class="lineno" valign="top"></td><td class="left">   retrieval request: i.e., a 200 (OK) response containing a</td><td> </td><td class="right">   retrieval request: i.e., a 200 (OK) response containing a</td><td class="lineno" valign="top"></td></tr>
    355356      <tr><td class="lineno" valign="top"></td><td class="left">   representation of the resource identified by the request target.</td><td> </td><td class="right">   representation of the resource identified by the request target.</td><td class="lineno" valign="top"></td></tr>
    356       <tr><td><a name="diff0019" /></td></tr>
     357      <tr><td><a name="diff0020" /></td></tr>
    357358      <tr><td class="lineno" valign="top"></td><td class="lblock">   However, it is also possible to cache negative results (e.g., 404 <span class="delete">not</span></td><td> </td><td class="rblock">   However, it is also possible to cache negative results (e.g., 404</td><td class="lineno" valign="top"></td></tr>
    358359      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   found),</span> incomplete results (e.g., 206 <span class="delete">partial content),</span> and responses</td><td> </td><td class="rblock">   <span class="insert">(Not Found),</span> incomplete results (e.g., 206 <span class="insert">(Partial Content)),</span> and</td><td class="lineno" valign="top"></td></tr>
     
    362363      <tr><td class="lineno" valign="top"></td><td class="left">   The default cache key consists of the request method and target URI.</td><td> </td><td class="right">   The default cache key consists of the request method and target URI.</td><td class="lineno" valign="top"></td></tr>
    363364      <tr><td class="lineno" valign="top"></td><td class="left">   However, since HTTP caches in common use today are typically limited</td><td> </td><td class="right">   However, since HTTP caches in common use today are typically limited</td><td class="lineno" valign="top"></td></tr>
    364       <tr><td><a name="diff0020" /></td></tr>
     365      <tr><td><a name="diff0021" /></td></tr>
    365366      <tr><td class="lineno" valign="top"></td><td class="lblock">   to caching responses to GET, m<span class="delete">ost</span> implementations simply decline</td><td> </td><td class="rblock">   to caching responses to GET, m<span class="insert">any</span> implementations simply decline</td><td class="lineno" valign="top"></td></tr>
    366367      <tr><td class="lineno" valign="top"></td><td class="left">   other methods and use only the URI as the key.</td><td> </td><td class="right">   other methods and use only the URI as the key.</td><td class="lineno" valign="top"></td></tr>
     
    369370      <tr><td class="lineno" valign="top"></td><td class="left">   entry might consist of multiple stored responses, each differentiated</td><td> </td><td class="right">   entry might consist of multiple stored responses, each differentiated</td><td class="lineno" valign="top"></td></tr>
    370371      <tr><td class="lineno" valign="top"></td><td class="left">   by a secondary key for the values of the original request's selecting</td><td> </td><td class="right">   by a secondary key for the values of the original request's selecting</td><td class="lineno" valign="top"></td></tr>
    371       <tr><td><a name="diff0021" /></td></tr>
     372      <tr><td><a name="diff0022" /></td></tr>
    372373      <tr><td class="lineno" valign="top"></td><td class="lblock">   header fields (Section <span class="delete">2.8</span>).</td><td> </td><td class="rblock">   header fields (Section <span class="insert">4.3</span>).</td><td class="lineno" valign="top"></td></tr>
    373374      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    374       <tr><td><a name="diff0022" /></td></tr>
     375      <tr><td><a name="diff0023" /></td></tr>
    375376      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.1.  Response Cacheability</span></td><td> </td><td class="rblock"><span class="insert">3.  Storing Responses in Caches</span></td><td class="lineno" valign="top"></td></tr>
    376377      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    382383      <tr><td class="lineno" valign="top"></td><td class="left">   o  the response status code is understood by the cache, and</td><td> </td><td class="right">   o  the response status code is understood by the cache, and</td><td class="lineno" valign="top"></td></tr>
    383384      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    384       <tr><td><a name="diff0023" /></td></tr>
     385      <tr><td><a name="diff0024" /></td></tr>
    385386      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  the "no-store" cache directive (see Section <span class="delete">3</span>.2) does not appear</td><td> </td><td class="rblock">   o  the "no-store" cache directive (see Section <span class="insert">7</span>.2) does not appear</td><td class="lineno" valign="top"></td></tr>
    386387      <tr><td class="lineno" valign="top"></td><td class="left">      in request or response header fields, and</td><td> </td><td class="right">      in request or response header fields, and</td><td class="lineno" valign="top"></td></tr>
    387388      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    388       <tr><td><a name="diff0024" /></td></tr>
     389      <tr><td><a name="diff0025" /></td></tr>
    389390      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  the "private" cache response directive (see Section <span class="delete">3</span>.2.2) does</td><td> </td><td class="rblock">   o  the "private" cache response directive (see Section <span class="insert">7.2</span>.2.2) does</td><td class="lineno" valign="top"></td></tr>
    390391      <tr><td class="lineno" valign="top"></td><td class="left">      not appear in the response, if the cache is shared, and</td><td> </td><td class="right">      not appear in the response, if the cache is shared, and</td><td class="lineno" valign="top"></td></tr>
    391392      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    392       <tr><td><a name="diff0025" /></td></tr>
     393      <tr><td><a name="diff0026" /></td></tr>
    393394      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  the <span class="delete">"Authorization"</span> header field (see Section 4.1 of [Part7]) does</td><td> </td><td class="rblock">   o  the <span class="insert">Authorization</span> header field (see Section 4.1 of [Part7]) does</td><td class="lineno" valign="top"></td></tr>
    394395      <tr><td class="lineno" valign="top"></td><td class="left">      not appear in the request, if the cache is shared, unless the</td><td> </td><td class="right">      not appear in the request, if the cache is shared, unless the</td><td class="lineno" valign="top"></td></tr>
    395       <tr><td><a name="diff0026" /></td></tr>
     396      <tr><td><a name="diff0027" /></td></tr>
    396397      <tr><td class="lineno" valign="top"></td><td class="lblock">      response explicitly allows it (see Section <span class="delete">2.7</span>), and</td><td> </td><td class="rblock">      response explicitly allows it (see Section <span class="insert">3.2</span>), and</td><td class="lineno" valign="top"></td></tr>
    397398      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    398399      <tr><td class="lineno" valign="top"></td><td class="left">   o  the response either:</td><td> </td><td class="right">   o  the response either:</td><td class="lineno" valign="top"></td></tr>
    399400      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    400       <tr><td><a name="diff0027" /></td></tr>
     401      <tr><td><a name="diff0028" /></td></tr>
    401402      <tr><td class="lineno" valign="top"></td><td class="lblock">      *  contains an Expires header field (see Section <span class="delete">3</span>.3), or</td><td> </td><td class="rblock">      *  contains an Expires header field (see Section <span class="insert">7</span>.3), or</td><td class="lineno" valign="top"></td></tr>
    402403      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    403404      <tr><td class="lineno" valign="top"></td><td class="left">      *  contains a max-age response cache directive (see</td><td> </td><td class="right">      *  contains a max-age response cache directive (see</td><td class="lineno" valign="top"></td></tr>
    404       <tr><td><a name="diff0028" /></td></tr>
     405      <tr><td><a name="diff0029" /></td></tr>
    405406      <tr><td class="lineno" valign="top"></td><td class="lblock">         Section <span class="delete">3.2.2</span>), or</td><td> </td><td class="rblock">         Section <span class="insert">7.2.2.7</span>), or</td><td class="lineno" valign="top"></td></tr>
    406407      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    408409      <tr><td class="lineno" valign="top"></td><td class="left">         shared, or</td><td> </td><td class="right">         shared, or</td><td class="lineno" valign="top"></td></tr>
    409410      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    410       <tr><td><a name="diff0029" /></td></tr>
     411      <tr><td><a name="diff0030" /></td></tr>
    411412      <tr><td class="lineno" valign="top"></td><td class="lblock">      *  contains a Cache Control Extension (see Section <span class="delete">3</span>.2.3) that</td><td> </td><td class="rblock">      *  contains a Cache Control Extension (see Section <span class="insert">7</span>.2.3) that</td><td class="lineno" valign="top"></td></tr>
    412413      <tr><td class="lineno" valign="top"></td><td class="left">         allows it to be cached, or</td><td> </td><td class="right">         allows it to be cached, or</td><td class="lineno" valign="top"></td></tr>
    413414      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    414415      <tr><td class="lineno" valign="top"></td><td class="left">      *  has a status code that can be served with heuristic freshness</td><td> </td><td class="right">      *  has a status code that can be served with heuristic freshness</td><td class="lineno" valign="top"></td></tr>
    415       <tr><td><a name="diff0030" /></td></tr>
     416      <tr><td><a name="diff0031" /></td></tr>
    416417      <tr><td class="lineno" valign="top"></td><td class="lblock">         (see Section <span class="delete">2.3.1.1</span>).</td><td> </td><td class="rblock">         (see Section <span class="insert">4.1.2</span>).</td><td class="lineno" valign="top"></td></tr>
    417418      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    418419      <tr><td class="lineno" valign="top"></td><td class="left">   Note that any of the requirements listed above can be overridden by a</td><td> </td><td class="right">   Note that any of the requirements listed above can be overridden by a</td><td class="lineno" valign="top"></td></tr>
    419       <tr><td><a name="diff0031" /></td></tr>
     420      <tr><td><a name="diff0032" /></td></tr>
    420421      <tr><td class="lineno" valign="top"></td><td class="lblock">   cache-control extension; see Section <span class="delete">3</span>.2.3.</td><td> </td><td class="rblock">   cache-control extension; see Section <span class="insert">7</span>.2.3.</td><td class="lineno" valign="top"></td></tr>
    421422      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    424425      <tr><td class="lineno" valign="top"></td><td class="left">   specific behavior.</td><td> </td><td class="right">   specific behavior.</td><td class="lineno" valign="top"></td></tr>
    425426      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    426       <tr><td><a name="diff0032" /></td></tr>
     427      <tr><td><a name="diff0033" /></td></tr>
    427428      <tr><td class="lineno" valign="top"></td><td class="lblock">   Note that, in normal operation, m<span class="delete">ost</span> caches will not store a response</td><td> </td><td class="rblock">   Note that, in normal operation, m<span class="insert">any</span> caches will not store a response</td><td class="lineno" valign="top"></td></tr>
    428429      <tr><td class="lineno" valign="top"></td><td class="left">   that has neither a cache validator nor an explicit expiration time,</td><td> </td><td class="right">   that has neither a cache validator nor an explicit expiration time,</td><td class="lineno" valign="top"></td></tr>
     
    430431      <tr><td class="lineno" valign="top"></td><td class="left">   are not prohibited from storing such responses.</td><td> </td><td class="right">   are not prohibited from storing such responses.</td><td class="lineno" valign="top"></td></tr>
    431432      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    432       <tr><td><a name="diff0033" /></td></tr>
     433      <tr><td><a name="diff0034" /></td></tr>
    433434      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">3.1.  Storing Incomplete Responses</span></td><td class="lineno" valign="top"></td></tr>
    434435      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
     
    447448      <tr><td class="lineno" valign="top"></td><td class="left">   A cache MAY complete a stored incomplete response by making a</td><td> </td><td class="right">   A cache MAY complete a stored incomplete response by making a</td><td class="lineno" valign="top"></td></tr>
    448449      <tr><td class="lineno" valign="top"></td><td class="left">   subsequent range request ([Part5]) and combining the successful</td><td> </td><td class="right">   subsequent range request ([Part5]) and combining the successful</td><td class="lineno" valign="top"></td></tr>
    449       <tr><td><a name="diff0034" /></td></tr>
     450      <tr><td><a name="diff0035" /></td></tr>
    450451      <tr><td class="lineno" valign="top"></td><td class="lblock">   response with the stored entry, as defined in Section <span class="delete">2.9</span>.  A cache</td><td> </td><td class="rblock">   response with the stored entry, as defined in Section <span class="insert">4.4</span>.  A cache</td><td class="lineno" valign="top"></td></tr>
    451452      <tr><td class="lineno" valign="top"></td><td class="left">   MUST NOT use an incomplete response to answer requests unless the</td><td> </td><td class="right">   MUST NOT use an incomplete response to answer requests unless the</td><td class="lineno" valign="top"></td></tr>
     
    455456      <tr><td class="lineno" valign="top"></td><td class="left">   marking it as such using the 206 (Partial Content) status code.</td><td> </td><td class="right">   marking it as such using the 206 (Partial Content) status code.</td><td class="lineno" valign="top"></td></tr>
    456457      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    457       <tr><td><a name="diff0035" /></td></tr>
     458      <tr><td><a name="diff0036" /></td></tr>
    458459      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.2.</span>  Constructing Responses from Caches</td><td> </td><td class="rblock"><span class="insert">3.2.  Storing Responses to Authenticated Requests</span></td><td class="lineno" valign="top"></td></tr>
    459460      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    486487      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    487488      <tr><td class="lineno" valign="top"></td><td class="left">   o  selecting header fields nominated by the stored response (if any)</td><td> </td><td class="right">   o  selecting header fields nominated by the stored response (if any)</td><td class="lineno" valign="top"></td></tr>
    488       <tr><td><a name="diff0036" /></td></tr>
     489      <tr><td><a name="diff0037" /></td></tr>
    489490      <tr><td class="lineno" valign="top"></td><td class="lblock">      match those presented (see Section <span class="delete">2.8</span>), and</td><td> </td><td class="rblock">      match those presented (see Section <span class="insert">4.3</span>), and</td><td class="lineno" valign="top"></td></tr>
    490491      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    491492      <tr><td class="lineno" valign="top"></td><td class="left">   o  the presented request does not contain the no-cache pragma</td><td> </td><td class="right">   o  the presented request does not contain the no-cache pragma</td><td class="lineno" valign="top"></td></tr>
    492       <tr><td><a name="diff0037" /></td></tr>
     493      <tr><td><a name="diff0038" /></td></tr>
    493494      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">3.4), nor the no-cache cache directive (Section 3</span>.2.1),</td><td> </td><td class="rblock">      (Section <span class="insert">7.4), nor the no-cache cache directive (Section 7</span>.2.1),</td><td class="lineno" valign="top"></td></tr>
    494495      <tr><td class="lineno" valign="top"></td><td class="left">      unless the stored response is successfully validated</td><td> </td><td class="right">      unless the stored response is successfully validated</td><td class="lineno" valign="top"></td></tr>
    495       <tr><td><a name="diff0038" /></td></tr>
     496      <tr><td><a name="diff0039" /></td></tr>
    496497      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">2.4</span>), and</td><td> </td><td class="rblock">      (Section <span class="insert">4.2</span>), and</td><td class="lineno" valign="top"></td></tr>
    497498      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    498499      <tr><td class="lineno" valign="top"></td><td class="left">   o  the stored response does not contain the no-cache cache directive</td><td> </td><td class="right">   o  the stored response does not contain the no-cache cache directive</td><td class="lineno" valign="top"></td></tr>
    499       <tr><td><a name="diff0039" /></td></tr>
     500      <tr><td><a name="diff0040" /></td></tr>
    500501      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">3.2.2),</span> unless it is successfully validated</td><td> </td><td class="rblock">      (Section <span class="insert">7.2.2.3),</span> unless it is successfully validated</td><td class="lineno" valign="top"></td></tr>
    501502      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">2.4),</span> and</td><td> </td><td class="rblock">      (Section <span class="insert">4.2),</span> and</td><td class="lineno" valign="top"></td></tr>
     
    503504      <tr><td class="lineno" valign="top"></td><td class="left">   o  the stored response is either:</td><td> </td><td class="right">   o  the stored response is either:</td><td class="lineno" valign="top"></td></tr>
    504505      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    505       <tr><td><a name="diff0040" /></td></tr>
     506      <tr><td><a name="diff0041" /></td></tr>
    506507      <tr><td class="lineno" valign="top"></td><td class="lblock">      *  fresh (see Section <span class="delete">2.3</span>), or</td><td> </td><td class="rblock">      *  fresh (see Section <span class="insert">4.1</span>), or</td><td class="lineno" valign="top"></td></tr>
    507508      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    508       <tr><td><a name="diff0041" /></td></tr>
     509      <tr><td><a name="diff0042" /></td></tr>
    509510      <tr><td class="lineno" valign="top"></td><td class="lblock">      *  allowed to be served stale (see Section <span class="delete">2.3.3</span>), or</td><td> </td><td class="rblock">      *  allowed to be served stale (see Section <span class="insert">4.1.4</span>), or</td><td class="lineno" valign="top"></td></tr>
    510511      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    511       <tr><td><a name="diff0042" /></td></tr>
     512      <tr><td><a name="diff0043" /></td></tr>
    512513      <tr><td class="lineno" valign="top"></td><td class="lblock">      *  successfully validated (see Section <span class="delete">2.4</span>).</td><td> </td><td class="rblock">      *  successfully validated (see Section <span class="insert">4.2</span>).</td><td class="lineno" valign="top"></td></tr>
    513514      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    514515      <tr><td class="lineno" valign="top"></td><td class="left">   Note that any of the requirements listed above can be overridden by a</td><td> </td><td class="right">   Note that any of the requirements listed above can be overridden by a</td><td class="lineno" valign="top"></td></tr>
    515       <tr><td><a name="diff0043" /></td></tr>
     516      <tr><td><a name="diff0044" /></td></tr>
    516517      <tr><td class="lineno" valign="top"></td><td class="lblock">   cache-control extension; see Section <span class="delete">3</span>.2.3.</td><td> </td><td class="rblock">   cache-control extension; see Section <span class="insert">7</span>.2.3.</td><td class="lineno" valign="top"></td></tr>
    517518      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    518519      <tr><td class="lineno" valign="top"></td><td class="left">   When a stored response is used to satisfy a request without</td><td> </td><td class="right">   When a stored response is used to satisfy a request without</td><td class="lineno" valign="top"></td></tr>
    519520      <tr><td class="lineno" valign="top"></td><td class="left">   validation, a cache MUST include a single Age header field</td><td> </td><td class="right">   validation, a cache MUST include a single Age header field</td><td class="lineno" valign="top"></td></tr>
    520       <tr><td><a name="diff0044" /></td></tr>
     521      <tr><td><a name="diff0045" /></td></tr>
    521522      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">3.1)</span> in the response with a value equal to the stored</td><td> </td><td class="rblock">   (Section <span class="insert">7.1)</span> in the response with a value equal to the stored</td><td class="lineno" valign="top"></td></tr>
    522523      <tr><td class="lineno" valign="top"></td><td class="lblock">   response's current_age; see Section <span class="delete">2.3.2.</span></td><td> </td><td class="rblock">   response's current_age; see Section <span class="insert">4.1.3.</span></td><td class="lineno" valign="top"></td></tr>
    523524      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    524525      <tr><td class="lineno" valign="top"></td><td class="left">   A cache MUST write through requests with methods that are unsafe</td><td> </td><td class="right">   A cache MUST write through requests with methods that are unsafe</td><td class="lineno" valign="top"></td></tr>
    525       <tr><td><a name="diff0045" /></td></tr>
     526      <tr><td><a name="diff0046" /></td></tr>
    526527      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">6.1.1</span> of [Part2]) to the origin server; i.e., a cache <span class="delete">must</span></td><td> </td><td class="rblock">   (Section <span class="insert">2.1.1</span> of [Part2]) to the origin server; i.e., a cache <span class="insert">is</span> not</td><td class="lineno" valign="top"></td></tr>
    527528      <tr><td class="lineno" valign="top"></td><td class="lblock">   not generate a reply to such a request before having forwarded the</td><td> </td><td class="rblock">   <span class="insert">allowed to</span> generate a reply to such a request before having forwarded</td><td class="lineno" valign="top"></td></tr>
     
    529530      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    530531      <tr><td class="lineno" valign="top"></td><td class="left">   Also, note that unsafe requests might invalidate already stored</td><td> </td><td class="right">   Also, note that unsafe requests might invalidate already stored</td><td class="lineno" valign="top"></td></tr>
    531       <tr><td><a name="diff0046" /></td></tr>
     532      <tr><td><a name="diff0047" /></td></tr>
    532533      <tr><td class="lineno" valign="top"></td><td class="lblock">   responses; see Section <span class="delete">2.</span>6.</td><td> </td><td class="rblock">   responses; see Section 6.</td><td class="lineno" valign="top"></td></tr>
    533534      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    543544      <tr><td class="lineno" valign="top"></td><td class="left">   standard.</td><td> </td><td class="right">   standard.</td><td class="lineno" valign="top"></td></tr>
    544545      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    545       <tr><td><a name="diff0047" /></td></tr>
     546      <tr><td><a name="diff0048" /></td></tr>
    546547      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.3</span>.  Freshness Model</td><td> </td><td class="rblock"><span class="insert">4.1</span>.  Freshness Model</td><td class="lineno" valign="top"></td></tr>
    547548      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    552553      <tr><td class="lineno" valign="top"></td><td class="left">   The primary mechanism for determining freshness is for an origin</td><td> </td><td class="right">   The primary mechanism for determining freshness is for an origin</td><td class="lineno" valign="top"></td></tr>
    553554      <tr><td class="lineno" valign="top"></td><td class="left">   server to provide an explicit expiration time in the future, using</td><td> </td><td class="right">   server to provide an explicit expiration time in the future, using</td><td class="lineno" valign="top"></td></tr>
    554       <tr><td><a name="diff0048" /></td></tr>
     555      <tr><td><a name="diff0049" /></td></tr>
    555556      <tr><td class="lineno" valign="top"></td><td class="lblock">   either the Expires header field (Section <span class="delete">3.3)</span> or the max-age response</td><td> </td><td class="rblock">   either the Expires header field (Section <span class="insert">7.3)</span> or the max-age response</td><td class="lineno" valign="top"></td></tr>
    556557      <tr><td class="lineno" valign="top"></td><td class="lblock">   cache directive (Section <span class="delete">3.2.2).</span>  Generally, origin servers will</td><td> </td><td class="rblock">   cache directive (Section <span class="insert">7.2.2.7).</span>  Generally, origin servers will</td><td class="lineno" valign="top"></td></tr>
     
    563564      <tr><td class="lineno" valign="top"></td><td class="left">   indicate that the response is already stale.  Compliant caches will</td><td> </td><td class="right">   indicate that the response is already stale.  Compliant caches will</td><td class="lineno" valign="top"></td></tr>
    564565      <tr><td class="lineno" valign="top"></td><td class="left">   normally validate the cached response before reusing it for</td><td> </td><td class="right">   normally validate the cached response before reusing it for</td><td class="lineno" valign="top"></td></tr>
    565       <tr><td><a name="diff0049" /></td></tr>
     566      <tr><td><a name="diff0050" /></td></tr>
    566567      <tr><td class="lineno" valign="top"></td><td class="lblock">   subsequent requests (see Section <span class="delete">2.3.3</span>).</td><td> </td><td class="rblock">   subsequent requests (see Section <span class="insert">4.1.4</span>).</td><td class="lineno" valign="top"></td></tr>
    567568      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    577578      <tr><td class="lineno" valign="top"></td><td class="left">      response_is_fresh = (freshness_lifetime &gt; current_age)</td><td> </td><td class="right">      response_is_fresh = (freshness_lifetime &gt; current_age)</td><td class="lineno" valign="top"></td></tr>
    578579      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    579       <tr><td><a name="diff0050" /></td></tr>
     580      <tr><td><a name="diff0051" /></td></tr>
    580581      <tr><td class="lineno" valign="top"></td><td class="lblock">   The freshness_lifetime is defined in Section <span class="delete">2.3.1;</span> the current_age</td><td> </td><td class="rblock">   The freshness_lifetime is defined in Section <span class="insert">4.1.1;</span> the current_age</td><td class="lineno" valign="top"></td></tr>
    581582      <tr><td class="lineno" valign="top"></td><td class="lblock">   is defined in Section <span class="delete">2.3.2.</span></td><td> </td><td class="rblock">   is defined in Section <span class="insert">4.1.3.</span></td><td class="lineno" valign="top"></td></tr>
     
    583584      <tr><td class="lineno" valign="top"></td><td class="left">   Additionally, clients can influence freshness calculation -- either</td><td> </td><td class="right">   Additionally, clients can influence freshness calculation -- either</td><td class="lineno" valign="top"></td></tr>
    584585      <tr><td class="lineno" valign="top"></td><td class="left">   constraining it relaxing it -- by using the max-age and min-fresh</td><td> </td><td class="right">   constraining it relaxing it -- by using the max-age and min-fresh</td><td class="lineno" valign="top"></td></tr>
    585       <tr><td><a name="diff0051" /></td></tr>
     586      <tr><td><a name="diff0052" /></td></tr>
    586587      <tr><td class="lineno" valign="top"></td><td class="lblock">   request cache directives.  See Section <span class="delete">3</span>.2.1 for details.</td><td> </td><td class="rblock">   request cache directives.  See Section <span class="insert">7</span>.2.1 for details.</td><td class="lineno" valign="top"></td></tr>
    587588      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    588589      <tr><td class="lineno" valign="top"></td><td class="left">   Note that freshness applies only to cache operation; it cannot be</td><td> </td><td class="right">   Note that freshness applies only to cache operation; it cannot be</td><td class="lineno" valign="top"></td></tr>
    589590      <tr><td class="lineno" valign="top"></td><td class="left">   used to force a user agent to refresh its display or reload a</td><td> </td><td class="right">   used to force a user agent to refresh its display or reload a</td><td class="lineno" valign="top"></td></tr>
    590       <tr><td><a name="diff0052" /></td></tr>
     591      <tr><td><a name="diff0053" /></td></tr>
    591592      <tr><td class="lineno" valign="top"></td><td class="lblock">   resource.  See Section <span class="delete">4</span> for an explanation of the difference between</td><td> </td><td class="rblock">   resource.  See Section <span class="insert">8</span> for an explanation of the difference between</td><td class="lineno" valign="top"></td></tr>
    592593      <tr><td class="lineno" valign="top"></td><td class="left">   caches and history mechanisms.</td><td> </td><td class="right">   caches and history mechanisms.</td><td class="lineno" valign="top"></td></tr>
    593594      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    594       <tr><td><a name="diff0053" /></td></tr>
     595      <tr><td><a name="diff0054" /></td></tr>
    595596      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.3</span>.1.  Calculating Freshness Lifetime</td><td> </td><td class="rblock"><span class="insert">4.1</span>.1.  Calculating Freshness Lifetime</td><td class="lineno" valign="top"></td></tr>
    596597      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    599600      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    600601      <tr><td class="lineno" valign="top"></td><td class="left">   o  If the cache is shared and the s-maxage response cache directive</td><td> </td><td class="right">   o  If the cache is shared and the s-maxage response cache directive</td><td class="lineno" valign="top"></td></tr>
    601       <tr><td><a name="diff0054" /></td></tr>
     602      <tr><td><a name="diff0055" /></td></tr>
    602603      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">3.2.2</span>) is present, use its value, or</td><td> </td><td class="rblock">      (Section <span class="insert">7.2.2.8</span>) is present, use its value, or</td><td class="lineno" valign="top"></td></tr>
    603604      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    604       <tr><td><a name="diff0055" /></td></tr>
     605      <tr><td><a name="diff0056" /></td></tr>
    605606      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  If the max-age response cache directive (Section <span class="delete">3.2.2</span>) is</td><td> </td><td class="rblock">   o  If the max-age response cache directive (Section <span class="insert">7.2.2.7</span>) is</td><td class="lineno" valign="top"></td></tr>
    606607      <tr><td class="lineno" valign="top"></td><td class="left">      present, use its value, or</td><td> </td><td class="right">      present, use its value, or</td><td class="lineno" valign="top"></td></tr>
    607608      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    608       <tr><td><a name="diff0056" /></td></tr>
     609      <tr><td><a name="diff0057" /></td></tr>
    609610      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  If the Expires response header field (Section <span class="delete">3</span>.3) is present, use</td><td> </td><td class="rblock">   o  If the Expires response header field (Section <span class="insert">7</span>.3) is present, use</td><td class="lineno" valign="top"></td></tr>
    610611      <tr><td class="lineno" valign="top"></td><td class="left">      its value minus the value of the Date response header field, or</td><td> </td><td class="right">      its value minus the value of the Date response header field, or</td><td class="lineno" valign="top"></td></tr>
     
    612613      <tr><td class="lineno" valign="top"></td><td class="left">   o  Otherwise, no explicit expiration time is present in the response.</td><td> </td><td class="right">   o  Otherwise, no explicit expiration time is present in the response.</td><td class="lineno" valign="top"></td></tr>
    613614      <tr><td class="lineno" valign="top"></td><td class="left">      A heuristic freshness lifetime might be applicable; see</td><td> </td><td class="right">      A heuristic freshness lifetime might be applicable; see</td><td class="lineno" valign="top"></td></tr>
    614       <tr><td><a name="diff0057" /></td></tr>
     615      <tr><td><a name="diff0058" /></td></tr>
    615616      <tr><td class="lineno" valign="top"></td><td class="lblock">      Section <span class="delete">2.3.1.1</span>.</td><td> </td><td class="rblock">      Section <span class="insert">4.1.2</span>.</td><td class="lineno" valign="top"></td></tr>
    616617      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    618619      <tr><td class="lineno" valign="top"></td><td class="left">   of the information comes from the origin server.</td><td> </td><td class="right">   of the information comes from the origin server.</td><td class="lineno" valign="top"></td></tr>
    619620      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    620       <tr><td><a name="diff0058" /></td></tr>
     621      <tr><td><a name="diff0059" /></td></tr>
    621622      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.3.1.1.</span>  Calculating Heuristic Freshness</td><td> </td><td class="rblock">   <span class="insert">When there is more than one value present for a given directive</span></td><td class="lineno" valign="top"></td></tr>
    622623      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   (e.g., two Expires header fields, multiple Cache-Control: max-age</span></td><td class="lineno" valign="top"></td></tr>
     
    629630      <tr><td class="lineno" valign="top"></td><td class="left">   If no explicit expiration time is present in a stored response that</td><td> </td><td class="right">   If no explicit expiration time is present in a stored response that</td><td class="lineno" valign="top"></td></tr>
    630631      <tr><td class="lineno" valign="top"></td><td class="left">   has a status code whose definition allows heuristic freshness to be</td><td> </td><td class="right">   has a status code whose definition allows heuristic freshness to be</td><td class="lineno" valign="top"></td></tr>
    631       <tr><td><a name="diff0059" /></td></tr>
     632      <tr><td><a name="diff0060" /></td></tr>
    632633      <tr><td class="lineno" valign="top"></td><td class="lblock">   used (including the following in Section <span class="delete">7</span> of [Part2]: <span class="delete">200, 203, 206,</span></td><td> </td><td class="rblock">   used (including the following in Section <span class="insert">4</span> of [Part2]: <span class="insert">200 (OK), 203</span></td><td class="lineno" valign="top"></td></tr>
    633634      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   300,</span> 301 and <span class="delete">410),</span> a cache MAY calculate a heuristic expiration time.</td><td> </td><td class="rblock"><span class="insert">   (Non-Authoritative Information), 206 (Partial Content), 300 (Multiple</span></td><td class="lineno" valign="top"></td></tr>
     
    647648      <tr><td class="lineno" valign="top"></td><td class="left">   time.  A typical setting of this fraction might be 10%.</td><td> </td><td class="right">   time.  A typical setting of this fraction might be 10%.</td><td class="lineno" valign="top"></td></tr>
    648649      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    649       <tr><td><a name="diff0060" /></td></tr>
     650      <tr><td><a name="diff0061" /></td></tr>
    650651      <tr><td class="lineno" valign="top"></td><td class="lblock">      Note: <span class="delete">RFC 2616 ([RFC2616],</span> Section <span class="delete">13.9) required that</span> caches <span class="delete">do</span></td><td> </td><td class="rblock">      Note: Section <span class="insert">13.9 of [RFC2616] prohibited</span> caches <span class="insert">from calculating</span></td><td class="lineno" valign="top"></td></tr>
    651652      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      not calculate</span> heuristic freshness for URIs with query components</td><td> </td><td class="rblock">      heuristic freshness for URIs with query components (i.e., those</td><td class="lineno" valign="top"></td></tr>
     
    655656      <tr><td class="lineno" valign="top"></td><td class="lblock">      to preclude caching.</td><td> </td><td class="rblock">      preclude caching.</td><td class="lineno" valign="top"></td></tr>
    656657      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    657       <tr><td><a name="diff0061" /></td></tr>
     658      <tr><td><a name="diff0062" /></td></tr>
    658659      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.3.2</span>.  Calculating Age</td><td> </td><td class="rblock"><span class="insert">4.1.3</span>.  Calculating Age</td><td class="lineno" valign="top"></td></tr>
    659660      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    671672      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    672673      <tr><td class="lineno" valign="top"></td><td class="left">      The term "age_value" denotes the value of the Age header field</td><td> </td><td class="right">      The term "age_value" denotes the value of the Age header field</td><td class="lineno" valign="top"></td></tr>
    673       <tr><td><a name="diff0062" /></td></tr>
     674      <tr><td><a name="diff0063" /></td></tr>
    674675      <tr><td class="lineno" valign="top"></td><td class="lblock">      (Section <span class="delete">3</span>.1), in a form appropriate for arithmetic operation; or</td><td> </td><td class="rblock">      (Section <span class="insert">7</span>.1), in a form appropriate for arithmetic operation; or</td><td class="lineno" valign="top"></td></tr>
    675676      <tr><td class="lineno" valign="top"></td><td class="left">      0, if not available.</td><td> </td><td class="right">      0, if not available.</td><td class="lineno" valign="top"></td></tr>
     
    681682      <tr><td class="lineno" valign="top"></td><td class="left">      response was generated.  The term "date_value" denotes the value</td><td> </td><td class="right">      response was generated.  The term "date_value" denotes the value</td><td class="lineno" valign="top"></td></tr>
    682683      <tr><td class="lineno" valign="top"></td><td class="left">      of the Date header field, in a form appropriate for arithmetic</td><td> </td><td class="right">      of the Date header field, in a form appropriate for arithmetic</td><td class="lineno" valign="top"></td></tr>
    683       <tr><td><a name="diff0063" /></td></tr>
     684      <tr><td><a name="diff0064" /></td></tr>
    684685      <tr><td class="lineno" valign="top"></td><td class="lblock">      operations.  See Section <span class="delete">10.2</span> of [Part2] for the definition of the</td><td> </td><td class="rblock">      operations.  See Section <span class="insert">9.10</span> of [Part2] for the definition of the</td><td class="lineno" valign="top"></td></tr>
    685686      <tr><td class="lineno" valign="top"></td><td class="left">      Date header field, and for requirements regarding responses</td><td> </td><td class="right">      Date header field, and for requirements regarding responses</td><td class="lineno" valign="top"></td></tr>
     
    705706      <tr><td class="lineno" valign="top"></td><td class="left">     corrected_initial_age = max(apparent_age, corrected_age_value);</td><td> </td><td class="right">     corrected_initial_age = max(apparent_age, corrected_age_value);</td><td class="lineno" valign="top"></td></tr>
    706707      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    707       <tr><td><a name="diff0064" /></td></tr>
     708      <tr><td><a name="diff0065" /></td></tr>
    708709      <tr><td class="lineno" valign="top"></td><td class="lblock">   unless the cache is confident in the value of the Age header (e.g.,</td><td> </td><td class="rblock">   unless the cache is confident in the value of the Age header <span class="insert">field</span></td><td class="lineno" valign="top"></td></tr>
    709710      <tr><td class="lineno" valign="top"></td><td class="lblock">   because there are no HTTP/1.0 hops in the Via <span class="delete">header),</span> in which case</td><td> </td><td class="rblock">   (e.g., because there are no HTTP/1.0 hops in the Via <span class="insert">header field),</span></td><td class="lineno" valign="top"></td></tr>
     
    732733      <tr><td class="lineno" valign="top"></td><td class="left">      most conservative possible conversion.</td><td> </td><td class="right">      most conservative possible conversion.</td><td class="lineno" valign="top"></td></tr>
    733734      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    734       <tr><td><a name="diff0065" /></td></tr>
     735      <tr><td><a name="diff0066" /></td></tr>
    735736      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.3.3</span>.  Serving Stale Responses</td><td> </td><td class="rblock"><span class="insert">4.1.4</span>.  Serving Stale Responses</td><td class="lineno" valign="top"></td></tr>
    736737      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    737738      <tr><td class="lineno" valign="top"></td><td class="left">   A "stale" response is one that either has explicit expiry information</td><td> </td><td class="right">   A "stale" response is one that either has explicit expiry information</td><td class="lineno" valign="top"></td></tr>
    738739      <tr><td class="lineno" valign="top"></td><td class="left">   or is allowed to have heuristic expiry calculated, but is not fresh</td><td> </td><td class="right">   or is allowed to have heuristic expiry calculated, but is not fresh</td><td class="lineno" valign="top"></td></tr>
    739       <tr><td><a name="diff0066" /></td></tr>
     740      <tr><td><a name="diff0067" /></td></tr>
    740741      <tr><td class="lineno" valign="top"></td><td class="lblock">   according to the calculations in Section <span class="delete">2.3</span>.</td><td> </td><td class="rblock">   according to the calculations in Section <span class="insert">4.1</span>.</td><td class="lineno" valign="top"></td></tr>
    741742      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    744745      <tr><td class="lineno" valign="top"></td><td class="left">   cache directive, a "must-revalidate" cache-response-directive, or an</td><td> </td><td class="right">   cache directive, a "must-revalidate" cache-response-directive, or an</td><td class="lineno" valign="top"></td></tr>
    745746      <tr><td class="lineno" valign="top"></td><td class="left">   applicable "s-maxage" or "proxy-revalidate" cache-response-directive;</td><td> </td><td class="right">   applicable "s-maxage" or "proxy-revalidate" cache-response-directive;</td><td class="lineno" valign="top"></td></tr>
    746       <tr><td><a name="diff0067" /></td></tr>
     747      <tr><td><a name="diff0068" /></td></tr>
    747748      <tr><td class="lineno" valign="top"></td><td class="lblock">   see Section <span class="delete">3</span>.2.2).</td><td> </td><td class="rblock">   see Section <span class="insert">7</span>.2.2).</td><td class="lineno" valign="top"></td></tr>
    748749      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    750751      <tr><td class="lineno" valign="top"></td><td class="left">   (i.e., it cannot contact the origin server or otherwise find a</td><td> </td><td class="right">   (i.e., it cannot contact the origin server or otherwise find a</td><td class="lineno" valign="top"></td></tr>
    751752      <tr><td class="lineno" valign="top"></td><td class="left">   forward path) or doing so is explicitly allowed (e.g., by the max-</td><td> </td><td class="right">   forward path) or doing so is explicitly allowed (e.g., by the max-</td><td class="lineno" valign="top"></td></tr>
    752       <tr><td><a name="diff0068" /></td></tr>
     753      <tr><td><a name="diff0069" /></td></tr>
    753754      <tr><td class="lineno" valign="top"></td><td class="lblock">   stale request directive; see Section <span class="delete">3</span>.2.1).</td><td> </td><td class="rblock">   stale request directive; see Section <span class="insert">7</span>.2.1).</td><td class="lineno" valign="top"></td></tr>
    754755      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    755756      <tr><td class="lineno" valign="top"></td><td class="left">   A cache SHOULD append a Warning header field with the 110 warn-code</td><td> </td><td class="right">   A cache SHOULD append a Warning header field with the 110 warn-code</td><td class="lineno" valign="top"></td></tr>
    756       <tr><td><a name="diff0069" /></td></tr>
     757      <tr><td><a name="diff0070" /></td></tr>
    757758      <tr><td class="lineno" valign="top"></td><td class="lblock">   (see Section <span class="delete">3</span>.6) to stale responses.  Likewise, a cache SHOULD add</td><td> </td><td class="rblock">   (see Section <span class="insert">7</span>.6) to stale responses.  Likewise, a cache SHOULD add</td><td class="lineno" valign="top"></td></tr>
    758759      <tr><td class="lineno" valign="top"></td><td class="left">   the 112 warn-code to stale responses if the cache is disconnected.</td><td> </td><td class="right">   the 112 warn-code to stale responses if the cache is disconnected.</td><td class="lineno" valign="top"></td></tr>
     
    766767      <tr><td class="lineno" valign="top"></td><td class="left">   because that response became stale in transit.</td><td> </td><td class="right">   because that response became stale in transit.</td><td class="lineno" valign="top"></td></tr>
    767768      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    768       <tr><td><a name="diff0070" /></td></tr>
     769      <tr><td><a name="diff0071" /></td></tr>
    769770      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.4</span>.  Validation Model</td><td> </td><td class="rblock"><span class="insert">4.2</span>.  Validation Model</td><td class="lineno" valign="top"></td></tr>
    770771      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    771772      <tr><td class="lineno" valign="top"></td><td class="left">   When a cache has one or more stored responses for a requested URI,</td><td> </td><td class="right">   When a cache has one or more stored responses for a requested URI,</td><td class="lineno" valign="top"></td></tr>
    772773      <tr><td class="lineno" valign="top"></td><td class="left">   but cannot serve any of them (e.g., because they are not fresh, or</td><td> </td><td class="right">   but cannot serve any of them (e.g., because they are not fresh, or</td><td class="lineno" valign="top"></td></tr>
    773       <tr><td><a name="diff0071" /></td></tr>
     774      <tr><td><a name="diff0072" /></td></tr>
    774775      <tr><td class="lineno" valign="top"></td><td class="lblock">   one cannot be selected; see Section <span class="delete">2.8</span>), it can use the conditional</td><td> </td><td class="rblock">   one cannot be selected; see Section <span class="insert">4.3</span>), it can use the conditional</td><td class="lineno" valign="top"></td></tr>
    775776      <tr><td class="lineno" valign="top"></td><td class="left">   request mechanism [Part4] in the forwarded request to give the origin</td><td> </td><td class="right">   request mechanism [Part4] in the forwarded request to give the origin</td><td class="lineno" valign="top"></td></tr>
     
    780781      <tr><td class="lineno" valign="top"></td><td class="left">   When sending such a conditional request, a cache adds an If-Modified-</td><td> </td><td class="right">   When sending such a conditional request, a cache adds an If-Modified-</td><td class="lineno" valign="top"></td></tr>
    781782      <tr><td class="lineno" valign="top"></td><td class="left">   Since header field whose value is that of the Last-Modified header</td><td> </td><td class="right">   Since header field whose value is that of the Last-Modified header</td><td class="lineno" valign="top"></td></tr>
    782       <tr><td><a name="diff0072" /></td></tr>
     783      <tr><td><a name="diff0073" /></td></tr>
    783784      <tr><td class="lineno" valign="top"></td><td class="lblock">   field from the selected (see Section <span class="delete">2.8</span>) stored response, if</td><td> </td><td class="rblock">   field from the selected (see Section <span class="insert">4.3</span>) stored response, if</td><td class="lineno" valign="top"></td></tr>
    784785      <tr><td class="lineno" valign="top"></td><td class="left">   available.</td><td> </td><td class="right">   available.</td><td class="lineno" valign="top"></td></tr>
     
    795796      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    796797      <tr><td class="lineno" valign="top"></td><td class="left">   o  A 304 (Not Modified) response status code indicates that the</td><td> </td><td class="right">   o  A 304 (Not Modified) response status code indicates that the</td><td class="lineno" valign="top"></td></tr>
    797       <tr><td><a name="diff0073" /></td></tr>
     798      <tr><td><a name="diff0074" /></td></tr>
    798799      <tr><td class="lineno" valign="top"></td><td class="lblock">      stored response can be updated and reused; see Section <span class="delete">2.4</span>.1.</td><td> </td><td class="rblock">      stored response can be updated and reused; see Section <span class="insert">4.2</span>.1.</td><td class="lineno" valign="top"></td></tr>
    799800      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    803804      <tr><td class="lineno" valign="top"></td><td class="left">      satisfy the request and MAY replace the stored response(s).</td><td> </td><td class="right">      satisfy the request and MAY replace the stored response(s).</td><td class="lineno" valign="top"></td></tr>
    804805      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    805       <tr><td><a name="diff0074" /></td></tr>
     806      <tr><td><a name="diff0075" /></td></tr>
    806807      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  However, if a cache receives a 5xx response while attempting to</td><td> </td><td class="rblock">   o  However, if a cache receives a 5xx <span class="insert">(Server Error)</span> response while</td><td class="lineno" valign="top"></td></tr>
    807808      <tr><td class="lineno" valign="top"></td><td class="lblock">      validate a response, it can either forward this response to the</td><td> </td><td class="rblock">      attempting to validate a response, it can either forward this</td><td class="lineno" valign="top"></td></tr>
     
    810811      <tr><td class="lineno" valign="top"></td><td class="lblock">      Section <span class="delete">2.3.3).</span></td><td> </td><td class="rblock">      response (see Section <span class="insert">4.1.4).</span></td><td class="lineno" valign="top"></td></tr>
    811812      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    812       <tr><td><a name="diff0075" /></td></tr>
     813      <tr><td><a name="diff0076" /></td></tr>
    813814      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.4</span>.1.  Freshening Responses with 304 Not Modified</td><td> </td><td class="rblock"><span class="insert">4.2</span>.1.  Freshening Responses with 304 Not Modified</td><td class="lineno" valign="top"></td></tr>
    814815      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    834835      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    835836      <tr><td class="lineno" valign="top"></td><td class="left">   o  delete any Warning header fields in the stored response with warn-</td><td> </td><td class="right">   o  delete any Warning header fields in the stored response with warn-</td><td class="lineno" valign="top"></td></tr>
    836       <tr><td><a name="diff0076" /></td></tr>
     837      <tr><td><a name="diff0077" /></td></tr>
    837838      <tr><td class="lineno" valign="top"></td><td class="lblock">      code 1xx (see Section <span class="delete">3.6);</span></td><td> </td><td class="rblock">      code 1xx (see Section <span class="insert">7.6);</span></td><td class="lineno" valign="top"></td></tr>
    838839      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    868869      <tr><td class="lineno" valign="top"></td><td class="left">      code 2xx; and,</td><td> </td><td class="right">      code 2xx; and,</td><td class="lineno" valign="top"></td></tr>
    869870      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    870       <tr><td><a name="diff0077" /></td></tr>
     871      <tr><td><a name="diff0078" /></td></tr>
    871872      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  use other header fields provided in the response to replace all</td><td> </td><td class="rblock">   o  use other header fields provided in the <span class="insert">304 (Not Modified)</span></td><td class="lineno" valign="top"></td></tr>
    872873      <tr><td class="lineno" valign="top"></td><td class="lblock">      instances of the corresponding header fields in the stored</td><td> </td><td class="rblock">      response to replace all instances of the corresponding header</td><td class="lineno" valign="top"></td></tr>
     
    924925      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   server.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    925926      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    926       <tr><td><a name="diff0078" /></td></tr>
     927      <tr><td><a name="diff0079" /></td></tr>
    927928      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.8.  Cach</span>ing Negotiated Responses</td><td> </td><td class="rblock"><span class="insert">4.3.  Us</span>ing Negotiated Responses</td><td class="lineno" valign="top"></td></tr>
    928929      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    929930      <tr><td class="lineno" valign="top"></td><td class="left">   When a cache receives a request that can be satisfied by a stored</td><td> </td><td class="right">   When a cache receives a request that can be satisfied by a stored</td><td class="lineno" valign="top"></td></tr>
    930       <tr><td><a name="diff0079" /></td></tr>
     931      <tr><td><a name="diff0080" /></td></tr>
    931932      <tr><td class="lineno" valign="top"></td><td class="lblock">   response that has a Vary header field (Section <span class="delete">3</span>.5), it MUST NOT use</td><td> </td><td class="rblock">   response that has a Vary header field (Section <span class="insert">7</span>.5), it MUST NOT use</td><td class="lineno" valign="top"></td></tr>
    932933      <tr><td class="lineno" valign="top"></td><td class="left">   that response unless all of the selecting header fields nominated by</td><td> </td><td class="right">   that response unless all of the selecting header fields nominated by</td><td class="lineno" valign="top"></td></tr>
     
    952953      <tr><td class="lineno" valign="top"></td><td class="left">   If multiple selected responses are available, the most recent</td><td> </td><td class="right">   If multiple selected responses are available, the most recent</td><td class="lineno" valign="top"></td></tr>
    953954      <tr><td class="lineno" valign="top"></td><td class="left">   response (as determined by the Date header field) is used; see</td><td> </td><td class="right">   response (as determined by the Date header field) is used; see</td><td class="lineno" valign="top"></td></tr>
    954       <tr><td><a name="diff0080" /></td></tr>
     955      <tr><td><a name="diff0081" /></td></tr>
    955956      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">2.2</span>.</td><td> </td><td class="rblock">   Section <span class="insert">4</span>.</td><td class="lineno" valign="top"></td></tr>
    956957      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    957958      <tr><td class="lineno" valign="top"></td><td class="left">   If no selected response is available, the cache can forward the</td><td> </td><td class="right">   If no selected response is available, the cache can forward the</td><td class="lineno" valign="top"></td></tr>
    958959      <tr><td class="lineno" valign="top"></td><td class="left">   presented request to the origin server in a conditional request; see</td><td> </td><td class="right">   presented request to the origin server in a conditional request; see</td><td class="lineno" valign="top"></td></tr>
    959       <tr><td><a name="diff0081" /></td></tr>
     960      <tr><td><a name="diff0082" /></td></tr>
    960961      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">2.4</span>.</td><td> </td><td class="rblock">   Section <span class="insert">4.2</span>.</td><td class="lineno" valign="top"></td></tr>
    961962      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    962       <tr><td><a name="diff0082" /></td></tr>
     963      <tr><td><a name="diff0083" /></td></tr>
    963964      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">2.9</span>.  Combining Partial Content</td><td> </td><td class="rblock"><span class="insert">4.4</span>.  Combining Partial Content</td><td class="lineno" valign="top"></td></tr>
    964965      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    976977      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    977978      <tr><td class="lineno" valign="top"></td><td class="left">   o  delete any Warning header fields in the stored response with warn-</td><td> </td><td class="right">   o  delete any Warning header fields in the stored response with warn-</td><td class="lineno" valign="top"></td></tr>
    978       <tr><td><a name="diff0083" /></td></tr>
     979      <tr><td><a name="diff0084" /></td></tr>
    979980      <tr><td class="lineno" valign="top"></td><td class="lblock">      code 1xx (see Section <span class="delete">3</span>.6);</td><td> </td><td class="rblock">      code 1xx (see Section <span class="insert">7</span>.6);</td><td class="lineno" valign="top"></td></tr>
    980981      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    986987      <tr><td class="lineno" valign="top"></td><td class="left">      header fields in the stored response.</td><td> </td><td class="right">      header fields in the stored response.</td><td class="lineno" valign="top"></td></tr>
    987988      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    988       <tr><td><a name="diff0084" /></td></tr>
     989      <tr><td><a name="diff0085" /></td></tr>
    989990      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3.</span>  Header Field Definitions</td><td> </td><td class="rblock"><span class="insert">5.  Updating Caches with HEAD Responses</span></td><td class="lineno" valign="top"></td></tr>
    990991      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    10531054      <tr><td class="lineno" valign="top"></td><td class="left">   fields related to caching.</td><td> </td><td class="right">   fields related to caching.</td><td class="lineno" valign="top"></td></tr>
    10541055      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1055       <tr><td><a name="diff0085" /></td></tr>
     1056      <tr><td><a name="diff0086" /></td></tr>
    10561057      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.1.  Age</td><td> </td><td class="rblock"><span class="insert">7</span>.1.  Age</td><td class="lineno" valign="top"></td></tr>
    10571058      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    10591060      <tr><td class="lineno" valign="top"></td><td class="left">   time since the response was generated or successfully validated at</td><td> </td><td class="right">   time since the response was generated or successfully validated at</td><td class="lineno" valign="top"></td></tr>
    10601061      <tr><td class="lineno" valign="top"></td><td class="left">   the origin server.  Age values are calculated as specified in</td><td> </td><td class="right">   the origin server.  Age values are calculated as specified in</td><td class="lineno" valign="top"></td></tr>
    1061       <tr><td><a name="diff0086" /></td></tr>
     1062      <tr><td><a name="diff0087" /></td></tr>
    10621063      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">2.3.2</span>.</td><td> </td><td class="rblock">   Section <span class="insert">4.1.3</span>.</td><td class="lineno" valign="top"></td></tr>
    10631064      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    10651066      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10661067      <tr><td class="lineno" valign="top"></td><td class="left">   Age field-values are non-negative integers, representing time in</td><td> </td><td class="right">   Age field-values are non-negative integers, representing time in</td><td class="lineno" valign="top"></td></tr>
    1067       <tr><td><a name="diff0087" /></td></tr>
     1068      <tr><td><a name="diff0088" /></td></tr>
    10681069      <tr><td class="lineno" valign="top"></td><td class="lblock">   seconds (see Section 1.<span class="delete">5</span>).</td><td> </td><td class="rblock">   seconds (see Section 1.<span class="insert">4.1</span>).</td><td class="lineno" valign="top"></td></tr>
    10691070      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    10721073      <tr><td class="lineno" valign="top"></td><td class="left">   HTTP/1.0 caches might not implement the Age header field.</td><td> </td><td class="right">   HTTP/1.0 caches might not implement the Age header field.</td><td class="lineno" valign="top"></td></tr>
    10731074      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1074       <tr><td><a name="diff0088" /></td></tr>
     1075      <tr><td><a name="diff0089" /></td></tr>
    10751076      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.2.  Cache-Control</td><td> </td><td class="rblock"><span class="insert">7</span>.2.  Cache-Control</td><td class="lineno" valign="top"></td></tr>
    10761077      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    10811082      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10821083      <tr><td class="lineno" valign="top"></td><td class="left">   A cache MUST obey the requirements of the Cache-Control directives</td><td> </td><td class="right">   A cache MUST obey the requirements of the Cache-Control directives</td><td class="lineno" valign="top"></td></tr>
    1083       <tr><td><a name="diff0089" /></td></tr>
     1084      <tr><td><a name="diff0090" /></td></tr>
    10841085      <tr><td class="lineno" valign="top"></td><td class="lblock">   defined in this section.  See Section <span class="delete">3</span>.2.3 for information about how</td><td> </td><td class="rblock">   defined in this section.  See Section <span class="insert">7</span>.2.3 for information about how</td><td class="lineno" valign="top"></td></tr>
    10851086      <tr><td class="lineno" valign="top"></td><td class="left">   Cache-Control directives defined elsewhere are handled.</td><td> </td><td class="right">   Cache-Control directives defined elsewhere are handled.</td><td class="lineno" valign="top"></td></tr>
    10861087      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10871088      <tr><td class="lineno" valign="top"></td><td class="left">      Note: HTTP/1.0 caches might not implement Cache-Control and might</td><td> </td><td class="right">      Note: HTTP/1.0 caches might not implement Cache-Control and might</td><td class="lineno" valign="top"></td></tr>
    1088       <tr><td><a name="diff0090" /></td></tr>
     1089      <tr><td><a name="diff0091" /></td></tr>
    10891090      <tr><td class="lineno" valign="top"></td><td class="lblock">      only implement Pragma: no-cache (see Section <span class="delete">3</span>.4).</td><td> </td><td class="rblock">      only implement Pragma: no-cache (see Section <span class="insert">7</span>.4).</td><td class="lineno" valign="top"></td></tr>
    10901091      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    10961097      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10971098      <tr><td class="lineno" valign="top"></td><td class="left">   Cache directives are identified by a token, to be compared case-</td><td> </td><td class="right">   Cache directives are identified by a token, to be compared case-</td><td class="lineno" valign="top"></td></tr>
    1098       <tr><td><a name="diff0091" /></td></tr>
     1099      <tr><td><a name="diff0092" /></td></tr>
    10991100      <tr><td class="lineno" valign="top"></td><td class="lblock">   insensitively, and have an optional <span class="delete">argument.</span></td><td> </td><td class="rblock">   insensitively, and have an optional <span class="insert">argument, that can use both token</span></td><td class="lineno" valign="top"></td></tr>
    11001101      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   and quoted-string syntax.  For the directives defined below that</span></td><td class="lineno" valign="top"></td></tr>
     
    11051106      <tr><td class="lineno" valign="top"></td><td class="left">     Cache-Control   = 1#cache-directive</td><td> </td><td class="right">     Cache-Control   = 1#cache-directive</td><td class="lineno" valign="top"></td></tr>
    11061107      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1107       <tr><td><a name="diff0092" /></td></tr>
     1108      <tr><td><a name="diff0093" /></td></tr>
    11081109      <tr><td class="lineno" valign="top"></td><td class="lblock">     cache-directive = <span class="delete">cache-request-directive</span></td><td> </td><td class="rblock">     cache-directive = <span class="insert">token [ "=" ( token</span> / <span class="insert">quoted-string ) ]</span></td><td class="lineno" valign="top"></td></tr>
    11091110      <tr><td class="lineno" valign="top"></td><td class="lblock">        / <span class="delete">cache-response-directive</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11101111      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1111       <tr><td><a name="diff0093" /></td></tr>
     1112      <tr><td><a name="diff0094" /></td></tr>
    11121113      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">cache-extension = token [ "=" ( token / quoted-string ) ]</span></td><td> </td><td class="rblock">   <span class="insert">For the cache directives defined below, no argument is defined (nor</span></td><td class="lineno" valign="top"></td></tr>
    11131114      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   allowed) otherwise stated otherwise.</span></td><td class="lineno" valign="top"></td></tr>
    11141115      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1115       <tr><td><a name="diff0094" /></td></tr>
     1116      <tr><td><a name="diff0095" /></td></tr>
    11161117      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.2.1.  Request Cache-Control Directives</td><td> </td><td class="rblock"><span class="insert">7</span>.2.1.  Request Cache-Control Directives</td><td class="lineno" valign="top"></td></tr>
    11171118      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1118       <tr><td><a name="diff0095" /></td></tr>
     1119      <tr><td><a name="diff0096" /></td></tr>
    11191120      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">cache-request-directive =</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.1.  no-cache</span></td><td class="lineno" valign="top"></td></tr>
    11201121      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">          "no-cache"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    11271128      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">        / cache-extension</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11281129      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1129       <tr><td><a name="diff0096" /></td></tr>
     1130      <tr><td><a name="diff0097" /></td></tr>
    11301131      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">no-cache</span></td><td> </td><td class="rblock">   <span class="insert">The "no-cache" request directive indicates that a cache MUST NOT use</span></td><td class="lineno" valign="top"></td></tr>
    11311132      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   a stored response to satisfy the request without successful</span></td><td class="lineno" valign="top"></td></tr>
    11321133      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   validation on the origin server.</span></td><td class="lineno" valign="top"></td></tr>
    11331134      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1134       <tr><td><a name="diff0097" /></td></tr>
     1135      <tr><td><a name="diff0098" /></td></tr>
    11351136      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The no-cache request directive indicates that a cache MUST NOT use</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.2.  no-store</span></td><td class="lineno" valign="top"></td></tr>
    11361137      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      a stored response to satisfy the request without successful</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11371138      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      validation on the origin server.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11381139      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1139       <tr><td><a name="diff0098" /></td></tr>
     1140      <tr><td><a name="diff0099" /></td></tr>
    11401141      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">no-store</span></td><td> </td><td class="rblock">   <span class="insert">The "no-store" request directive indicates that a cache MUST NOT</span></td><td class="lineno" valign="top"></td></tr>
    11411142      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   store any part of either this request or any response to it.  This</span></td><td class="lineno" valign="top"></td></tr>
     
    11461147      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   promptly as possible after forwarding it.</span></td><td class="lineno" valign="top"></td></tr>
    11471148      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1148       <tr><td><a name="diff0099" /></td></tr>
     1149      <tr><td><a name="diff0100" /></td></tr>
    11491150      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The no-store request directive indicates that a cache MUST NOT</span></td><td> </td><td class="rblock">   This directive <span class="insert">is</span> NOT <span class="insert">a reliable or sufficient mechanism for ensuring</span></td><td class="lineno" valign="top"></td></tr>
    11501151      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      store any part of either this request or any response to it.</span>  This</td><td> </td><td class="rblock"><span class="insert">   privacy.  In particular, malicious or compromised caches might not</span></td><td class="lineno" valign="top"></td></tr>
     
    11551156      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      storage as promptly as possible after forwarding it.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11561157      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1157       <tr><td><a name="diff0100" /></td></tr>
     1158      <tr><td><a name="diff0101" /></td></tr>
    11581159      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">This</span> directive is <span class="delete">NOT</span> a <span class="delete">reliable or sufficient mechanism for</span></td><td> </td><td class="rblock">   <span class="insert">Note that if a request containing this</span> directive is <span class="insert">satisfied from</span> a</td><td class="lineno" valign="top"></td></tr>
    11591160      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      ensuring privacy.  In particular, malicious or compromised caches</span></td><td> </td><td class="rblock">   <span class="insert">cache, the no-store request directive does</span> not <span class="insert">apply</span> to <span class="insert">the already</span></td><td class="lineno" valign="top"></td></tr>
     
    11611162      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      networks might be vulnerable</span> to <span class="delete">eavesdropping.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11621163      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1163       <tr><td><a name="diff0101" /></td></tr>
     1164      <tr><td><a name="diff0102" /></td></tr>
    11641165      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">Note that if a request containing this directive is satisfied from</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.3.  max-age</span></td><td class="lineno" valign="top"></td></tr>
    11651166      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      a cache, the no-store request directive does not apply to the</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11661167      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      already stored response.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11671168      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1168       <tr><td><a name="diff0102" /></td></tr>
     1169      <tr><td><a name="diff0103" /></td></tr>
    11691170      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">max-age</span></td><td> </td><td class="rblock">   <span class="insert">Argument syntax:</span></td><td class="lineno" valign="top"></td></tr>
    11701171      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1171       <tr><td><a name="diff0103" /></td></tr>
     1172      <tr><td><a name="diff0104" /></td></tr>
    11721173      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The max-age request directive indicates that the client is</span></td><td> </td><td class="rblock">      <span class="insert">delta-seconds (see Section 1.4.1)</span></td><td class="lineno" valign="top"></td></tr>
    11731174      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      unwilling to accept a response whose age is greater than the</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    11761177      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      stale response.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11771178      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1178       <tr><td><a name="diff0104" /></td></tr>
     1179      <tr><td><a name="diff0105" /></td></tr>
    11791180      <tr><td class="lineno" valign="top"></td><td class="lblock">   max-stale</td><td> </td><td class="rblock">   <span class="insert">The "max-age" request directive indicates that the client is</span></td><td class="lineno" valign="top"></td></tr>
    11801181      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   unwilling to accept a response whose age is greater than the</span></td><td class="lineno" valign="top"></td></tr>
     
    11831184      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   response.</span></td><td class="lineno" valign="top"></td></tr>
    11841185      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1185       <tr><td><a name="diff0105" /></td></tr>
     1186      <tr><td><a name="diff0106" /></td></tr>
    11861187      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The max-stale request</span> directive <span class="delete">indicates that</span> the <span class="delete">client is</span></td><td> </td><td class="rblock">   <span class="insert">Note: This</span> directive <span class="insert">uses</span> the <span class="insert">token form</span> of the <span class="insert">argument syntax;</span></td><td class="lineno" valign="top"></td></tr>
    11871188      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      willing to accept a response that has exceeded its expiration</span></td><td> </td><td class="rblock"><span class="insert">   e.g., 'max-age=5', not 'max-age="5"'.  Senders SHOULD NOT use the</span></td><td class="lineno" valign="top"></td></tr>
     
    11921193      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      stale response of any age.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    11931194      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1194       <tr><td><a name="diff0106" /></td></tr>
     1195      <tr><td><a name="diff0107" /></td></tr>
    11951196      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   min-fresh</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.4.  max-stale</span></td><td class="lineno" valign="top"></td></tr>
    11961197      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1197       <tr><td><a name="diff0107" /></td></tr>
     1198      <tr><td><a name="diff0108" /></td></tr>
    11981199      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The min-fresh request directive indicates that the client is</span></td><td> </td><td class="rblock">   <span class="insert">Argument syntax:</span></td><td class="lineno" valign="top"></td></tr>
    11991200      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      willing to accept a response whose freshness lifetime is no less</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    12021203      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      the specified number of seconds.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    12031204      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1204       <tr><td><a name="diff0108" /></td></tr>
     1205      <tr><td><a name="diff0109" /></td></tr>
    12051206      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">no-transform</span></td><td> </td><td class="rblock">   <span class="insert">   delta-seconds (see Section 1.4.1)</span></td><td class="lineno" valign="top"></td></tr>
    12061207      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1207       <tr><td><a name="diff0109" /></td></tr>
     1208      <tr><td><a name="diff0110" /></td></tr>
    12081209      <tr><td class="lineno" valign="top"></td><td class="lblock">      The <span class="delete">no-transform</span> request directive indicates that <span class="delete">an intermediary</span></td><td> </td><td class="rblock">   The <span class="insert">"max-stale"</span> request directive indicates that <span class="insert">the client is</span></td><td class="lineno" valign="top"></td></tr>
    12091210      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      (whether or not it implements</span> a <span class="delete">cache) MUST NOT change</span> the</td><td> </td><td class="rblock"><span class="insert">   willing to accept a response that has exceeded its expiration time.</span></td><td class="lineno" valign="top"></td></tr>
     
    12141215      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   any age.</span></td><td class="lineno" valign="top"></td></tr>
    12151216      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1216       <tr><td><a name="diff0110" /></td></tr>
     1217      <tr><td><a name="diff0111" /></td></tr>
    12171218      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">only-if-cached</span></td><td> </td><td class="rblock">   <span class="insert">Note: This directive uses the token form of the argument syntax;</span></td><td class="lineno" valign="top"></td></tr>
    12181219      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   e.g., 'max-stale=10', not 'max-stale="10"'.  Senders SHOULD NOT use</span></td><td class="lineno" valign="top"></td></tr>
    12191220      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   the quoted-string form.</span></td><td class="lineno" valign="top"></td></tr>
    12201221      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1221       <tr><td><a name="diff0111" /></td></tr>
     1222      <tr><td><a name="diff0112" /></td></tr>
    12221223      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The only-if-cached request directive indicates that the client</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.5.  min-fresh</span></td><td class="lineno" valign="top"></td></tr>
    12231224      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      only wishes to obtain a stored response.  If it receives this</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    12291230      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      that group of caches.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    12301231      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1231       <tr><td><a name="diff0112" /></td></tr>
     1232      <tr><td><a name="diff0113" /></td></tr>
    12321233      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3.2.2.  Response Cache-Control Directives</span></td><td> </td><td class="rblock"><span class="insert">   Argument syntax:</span></td><td class="lineno" valign="top"></td></tr>
    12331234      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1234       <tr><td><a name="diff0113" /></td></tr>
     1235      <tr><td><a name="diff0114" /></td></tr>
    12351236      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">cache-response-directive =</span></td><td> </td><td class="rblock">      delta-seconds <span class="insert">(see Section 1.4.1)</span></td><td class="lineno" valign="top"></td></tr>
    12361237      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">          "public"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    12451246      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">        / cache-extension</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    12461247      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1247       <tr><td><a name="diff0114" /></td></tr>
     1248      <tr><td><a name="diff0115" /></td></tr>
    12481249      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">public</span></td><td> </td><td class="rblock">   <span class="insert">The "min-fresh" request directive indicates that the client is</span></td><td class="lineno" valign="top"></td></tr>
    12491250      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   willing to accept a response whose freshness lifetime is no less than</span></td><td class="lineno" valign="top"></td></tr>
     
    12521253      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   specified number of seconds.</span></td><td class="lineno" valign="top"></td></tr>
    12531254      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1254       <tr><td><a name="diff0115" /></td></tr>
     1255      <tr><td><a name="diff0116" /></td></tr>
    12551256      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The public response</span> directive <span class="delete">indicates that a response whose</span></td><td> </td><td class="rblock">   <span class="insert">Note: This</span> directive <span class="insert">uses the token form of the argument syntax;</span></td><td class="lineno" valign="top"></td></tr>
    12561257      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      associated request contains an 'Authentication' header MAY be</span></td><td> </td><td class="rblock"><span class="insert">   e.g., 'min-fresh=20', not 'min-fresh="20"'.  Senders SHOULD NOT use</span></td><td class="lineno" valign="top"></td></tr>
    12571258      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      stored (see Section 2.7).</span></td><td> </td><td class="rblock"><span class="insert">   the quoted-string form.</span></td><td class="lineno" valign="top"></td></tr>
    12581259      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1259       <tr><td><a name="diff0116" /></td></tr>
     1260      <tr><td><a name="diff0117" /></td></tr>
    12601261      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   private</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.6.  no-transform</span></td><td class="lineno" valign="top"></td></tr>
    12611262      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1262       <tr><td><a name="diff0117" /></td></tr>
     1263      <tr><td><a name="diff0118" /></td></tr>
    12631264      <tr><td class="lineno" valign="top"></td><td class="lblock">      The <span class="delete">private response</span> directive indicates that <span class="delete">the response message</span></td><td> </td><td class="rblock">   The <span class="insert">"no-transform" request</span> directive indicates that <span class="insert">an intermediary</span></td><td class="lineno" valign="top"></td></tr>
    12641265      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      is intended for</span> a <span class="delete">single user and</span> MUST NOT <span class="delete">be stored by a shared</span></td><td> </td><td class="rblock"><span class="insert">   (whether or not it implements</span> a <span class="insert">cache)</span> MUST NOT <span class="insert">change the Content-</span></td><td class="lineno" valign="top"></td></tr>
     
    12661267      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   the <span class="insert">request representation.</span></td><td class="lineno" valign="top"></td></tr>
    12671268      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1268       <tr><td><a name="diff0118" /></td></tr>
     1269      <tr><td><a name="diff0119" /></td></tr>
    12691270      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">If the private response directive specifies one or more field-</span></td><td> </td><td class="rblock"><span class="insert">7.2.1.7.  only-if-cached</span></td><td class="lineno" valign="top"></td></tr>
    12701271      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      names, this requirement is limited to the field-values associated</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    12731274      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      the remainder of the response message.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    12741275      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1275       <tr><td><a name="diff0119" /></td></tr>
     1276      <tr><td><a name="diff0120" /></td></tr>
    12761277      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">Note: This usage of</span> the <span class="delete">word "private"</span> only <span class="delete">controls where the</span></td><td> </td><td class="rblock">   <span class="insert">The "only-if-cached" request directive indicates that</span> the <span class="insert">client</span> only</td><td class="lineno" valign="top"></td></tr>
    12771278      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      response can be stored;</span> it <span class="delete">cannot ensure the privacy of the</span></td><td> </td><td class="rblock">   <span class="insert">wishes to obtain a stored response.  If</span> it <span class="insert">receives this directive, a</span></td><td class="lineno" valign="top"></td></tr>
     
    12821283      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   member cache MAY forward such a request within that group of caches.</span></td><td class="lineno" valign="top"></td></tr>
    12831284      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1284       <tr><td><a name="diff0120" /></td></tr>
     1285      <tr><td><a name="diff0121" /></td></tr>
    12851286      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   no-cache</span></td><td> </td><td class="rblock"><span class="insert">7.2.2.  Response Cache-Control Directives</span></td><td class="lineno" valign="top"></td></tr>
    12861287      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1287       <tr><td><a name="diff0121" /></td></tr>
     1288      <tr><td><a name="diff0122" /></td></tr>
    12881289      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The no-cache response directive indicates that the response MUST</span></td><td> </td><td class="rblock"><span class="insert">7.2.2.1.  public</span></td><td class="lineno" valign="top"></td></tr>
    12891290      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      NOT be used to satisfy a subsequent request without successful</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    12931294      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      stale responses.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    12941295      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1295       <tr><td><a name="diff0122" /></td></tr>
     1296      <tr><td><a name="diff0123" /></td></tr>
    12961297      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">If the no-cache</span> response directive <span class="delete">specifies one or more field-</span></td><td> </td><td class="rblock">   <span class="insert">The "public"</span> response directive <span class="insert">indicates</span> that a <span class="insert">response whose</span></td><td class="lineno" valign="top"></td></tr>
    12971298      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      names, then a cache MAY use the response to satisfy a subsequent</span></td><td> </td><td class="rblock"><span class="insert">   associated</span> request <span class="insert">contains</span> an <span class="insert">'Authentication'</span> header <span class="insert">MAY be stored</span></td><td class="lineno" valign="top"></td></tr>
     
    13041305      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      the response.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13051306      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1306       <tr><td><a name="diff0123" /></td></tr>
     1307      <tr><td><a name="diff0124" /></td></tr>
    13071308      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">Note: Most HTTP/1.0 caches will not recognize or obey this</span></td><td> </td><td class="rblock"><span class="insert">7.2.2.2.  private</span></td><td class="lineno" valign="top"></td></tr>
    13081309      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      directive.  Also, no-cache response directives with field-names</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    13111312      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      qualified form is not widely implemented.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13121313      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1313       <tr><td><a name="diff0124" /></td></tr>
     1314      <tr><td><a name="diff0125" /></td></tr>
    13141315      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">no-store</span></td><td> </td><td class="rblock">   <span class="insert">Argument syntax:</span></td><td class="lineno" valign="top"></td></tr>
    13151316      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1316       <tr><td><a name="diff0125" /></td></tr>
     1317      <tr><td><a name="diff0126" /></td></tr>
    13171318      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The no-store response directive indicates that a cache MUST NOT</span></td><td> </td><td class="rblock">      <span class="insert">#field-name</span></td><td class="lineno" valign="top"></td></tr>
    13181319      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      store any part of either the immediate request or response.  This</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    13231324      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      storage as promptly as possible after forwarding it.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13241325      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1325       <tr><td><a name="diff0126" /></td></tr>
     1326      <tr><td><a name="diff0127" /></td></tr>
    13261327      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">This</span> directive is <span class="delete">NOT a reliable or sufficient mechanism</span> for</td><td> </td><td class="rblock">   <span class="insert">The "private" response</span> directive <span class="insert">indicates that the response message</span></td><td class="lineno" valign="top"></td></tr>
    13271328      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">ensuring privacy.  In particular, malicious or compromised caches</span></td><td> </td><td class="rblock">   is <span class="insert">intended</span> for <span class="insert">a single user</span> and <span class="insert">MUST NOT</span> be <span class="insert">stored by a shared</span></td><td class="lineno" valign="top"></td></tr>
     
    13291330      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      networks might</span> be <span class="delete">vulnerable to eavesdropping.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13301331      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1331       <tr><td><a name="diff0127" /></td></tr>
     1332      <tr><td><a name="diff0128" /></td></tr>
    13321333      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">must-revalidate</span></td><td> </td><td class="rblock">   <span class="insert">If the private response directive specifies one or more field-names,</span></td><td class="lineno" valign="top"></td></tr>
    13331334      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   this requirement is limited to the field-values associated with the</span></td><td class="lineno" valign="top"></td></tr>
     
    13361337      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   remainder of the response message.</span></td><td class="lineno" valign="top"></td></tr>
    13371338      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1338       <tr><td><a name="diff0128" /></td></tr>
     1339      <tr><td><a name="diff0129" /></td></tr>
    13391340      <tr><td class="lineno" valign="top"></td><td class="lblock">      The <span class="delete">must-revalidate response directive indicates that once it has</span></td><td> </td><td class="rblock">   The <span class="insert">field-names given are not limited</span> to the <span class="insert">set of standard header</span></td><td class="lineno" valign="top"></td></tr>
    13401341      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      become stale, a cache MUST NOT use the response</span> to <span class="delete">satisfy</span></td><td> </td><td class="rblock"><span class="insert">   fields defined by this specification.  Field names are case-</span></td><td class="lineno" valign="top"></td></tr>
     
    13421343      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      server.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13431344      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1344       <tr><td><a name="diff0129" /></td></tr>
     1345      <tr><td><a name="diff0130" /></td></tr>
    13451346      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The must-revalidate directive is necessary to support reliable</span></td><td> </td><td class="rblock">   <span class="insert">Note: This usage of the word "private" only controls where the</span></td><td class="lineno" valign="top"></td></tr>
    13461347      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      operation for certain protocol features.  In all circumstances a</span></td><td> </td><td class="rblock"><span class="insert">   response can be stored; it</span> cannot <span class="insert">ensure</span> the <span class="insert">privacy of the message</span></td><td class="lineno" valign="top"></td></tr>
     
    13501351      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   form is not widely implemented.</span></td><td class="lineno" valign="top"></td></tr>
    13511352      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1352       <tr><td><a name="diff0130" /></td></tr>
     1353      <tr><td><a name="diff0131" /></td></tr>
    13531354      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The must-revalidate</span> directive <span class="delete">ought to be used by servers if and</span></td><td> </td><td class="rblock">   <span class="insert">Note: This</span> directive <span class="insert">uses the quoted-string form of the argument</span></td><td class="lineno" valign="top"></td></tr>
    13541355      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      only</span> if <span class="delete">failure</span> to <span class="delete">validate a request on the representation could</span></td><td> </td><td class="rblock"><span class="insert">   syntax.  Senders SHOULD NOT use the token form (even</span> if <span class="insert">quoting</span></td><td class="lineno" valign="top"></td></tr>
     
    13561357      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      financial transaction.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13571358      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1358       <tr><td><a name="diff0131" /></td></tr>
     1359      <tr><td><a name="diff0132" /></td></tr>
    13591360      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   proxy-revalidat</span>e</td><td> </td><td class="rblock"><span class="insert">7.2.2.3.  no-cach</span>e</td><td class="lineno" valign="top"></td></tr>
    13601361      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1361       <tr><td><a name="diff0132" /></td></tr>
     1362      <tr><td><a name="diff0133" /></td></tr>
    13621363      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The proxy-revalidate response directive has the same meaning as</span></td><td> </td><td class="rblock">   <span class="insert">Argument syntax:</span></td><td class="lineno" valign="top"></td></tr>
    13631364      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      the must-revalidate response directive, except that it does not</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13641365      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      apply to private caches.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13651366      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1366       <tr><td><a name="diff0133" /></td></tr>
     1367      <tr><td><a name="diff0134" /></td></tr>
    13671368      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">max-ag</span>e</td><td> </td><td class="rblock">   <span class="insert">   #field-nam</span>e</td><td class="lineno" valign="top"></td></tr>
    13681369      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1369       <tr><td><a name="diff0134" /></td></tr>
     1370      <tr><td><a name="diff0135" /></td></tr>
    13701371      <tr><td class="lineno" valign="top"></td><td class="lblock">      The <span class="delete">max-age</span> response directive indicates that the response <span class="delete">is to</span></td><td> </td><td class="rblock">   The <span class="insert">"no-cache"</span> response directive indicates that the response <span class="insert">MUST</span></td><td class="lineno" valign="top"></td></tr>
    13711372      <tr><td class="lineno" valign="top"></td><td class="lblock">      be <span class="delete">considered stale after its age is greater than</span> the <span class="delete">specified</span></td><td> </td><td class="rblock"><span class="insert">   NOT</span> be <span class="insert">used to satisfy a subsequent request without successful</span></td><td class="lineno" valign="top"></td></tr>
     
    13751376      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   responses.</span></td><td class="lineno" valign="top"></td></tr>
    13761377      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1377       <tr><td><a name="diff0135" /></td></tr>
     1378      <tr><td><a name="diff0136" /></td></tr>
    13781379      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">s-maxage</span></td><td> </td><td class="rblock">   <span class="insert">If the no-cache response directive specifies one or more field-names,</span></td><td class="lineno" valign="top"></td></tr>
    13791380      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   then a cache MAY use the response to satisfy a subsequent request,</span></td><td class="lineno" valign="top"></td></tr>
     
    13851386      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   still allowing caching of the rest of the response.</span></td><td class="lineno" valign="top"></td></tr>
    13861387      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1387       <tr><td><a name="diff0136" /></td></tr>
     1388      <tr><td><a name="diff0137" /></td></tr>
    13881389      <tr><td class="lineno" valign="top"></td><td class="lblock">      The <span class="delete">s-maxage response directive indicates that, in shared caches,</span></td><td> </td><td class="rblock">   The <span class="insert">field-names given are not limited to</span> the <span class="insert">set of standard header</span></td><td class="lineno" valign="top"></td></tr>
    13891390      <tr><td class="lineno" valign="top"></td><td class="lblock">      the <span class="delete">maximum age specified</span> by this <span class="delete">directive overrides the maximum</span></td><td> </td><td class="rblock"><span class="insert">   fields defined</span> by this <span class="insert">specification.  Field names are case-</span></td><td class="lineno" valign="top"></td></tr>
     
    13921393      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      of the proxy-revalidate response directive.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    13931394      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1394       <tr><td><a name="diff0137" /></td></tr>
     1395      <tr><td><a name="diff0138" /></td></tr>
    13951396      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">no-transform</span></td><td> </td><td class="rblock">   <span class="insert">Note: Many HTTP/1.0 caches will not recognize or obey this directive.</span></td><td class="lineno" valign="top"></td></tr>
    13961397      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   Also, no-cache response directives with field-names are often handled</span></td><td class="lineno" valign="top"></td></tr>
     
    13991400      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   widely implemented.</span></td><td class="lineno" valign="top"></td></tr>
    14001401      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1401       <tr><td><a name="diff0138" /></td></tr>
     1402      <tr><td><a name="diff0139" /></td></tr>
    14021403      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">The no-transform response</span> directive <span class="delete">indicates that an intermediary</span></td><td> </td><td class="rblock">   <span class="insert">Note: This</span> directive <span class="insert">uses the quoted-string form</span> of the <span class="insert">argument</span></td><td class="lineno" valign="top"></td></tr>
    14031404      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      (regardless</span> of <span class="delete">whether it implements a cache) MUST NOT change</span> the</td><td> </td><td class="rblock"><span class="insert">   syntax.  Senders SHOULD NOT use</span> the <span class="insert">token form (even if quoting</span></td><td class="lineno" valign="top"></td></tr>
     
    14051406      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      fields, nor</span> the <span class="delete">response representation.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    14061407      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1407       <tr><td><a name="diff0139" /></td></tr>
     1408      <tr><td><a name="diff0140" /></td></tr>
    14081409      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3.2.3.</span>  Cache Control Extensions</td><td> </td><td class="rblock"><span class="insert">7.2.2.4.  no-store</span></td><td class="lineno" valign="top"></td></tr>
    14091410      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    15041505      <tr><td class="lineno" valign="top"></td><td class="left">   define this new directive to mean that, in addition to any private</td><td> </td><td class="right">   define this new directive to mean that, in addition to any private</td><td class="lineno" valign="top"></td></tr>
    15051506      <tr><td class="lineno" valign="top"></td><td class="left">   cache, any cache that is shared only by members of the community</td><td> </td><td class="right">   cache, any cache that is shared only by members of the community</td><td class="lineno" valign="top"></td></tr>
    1506       <tr><td><a name="diff0140" /></td></tr>
     1507      <tr><td><a name="diff0141" /></td></tr>
    15071508      <tr><td class="lineno" valign="top"></td><td class="lblock">   named within its value <span class="delete">may</span> cache the response.  An origin server</td><td> </td><td class="rblock">   named within its value <span class="insert">is allowed to</span> cache the response.  An origin</td><td class="lineno" valign="top"></td></tr>
    15081509      <tr><td class="lineno" valign="top"></td><td class="lblock">   wishing to allow the UCI community to use an otherwise private</td><td> </td><td class="rblock">   server wishing to allow the UCI community to use an otherwise private</td><td class="lineno" valign="top"></td></tr>
     
    15221523      <tr><td class="lineno" valign="top"></td><td class="left">   correct even if the cache does not understand the extension(s).</td><td> </td><td class="right">   correct even if the cache does not understand the extension(s).</td><td class="lineno" valign="top"></td></tr>
    15231524      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1524       <tr><td><a name="diff0141" /></td></tr>
     1525      <tr><td><a name="diff0142" /></td></tr>
    15251526      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   <span class="insert">New extension directives ought to consider defining:</span></td><td class="lineno" valign="top"></td></tr>
    15261527      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    15481549      <tr><td class="lineno" valign="top"></td><td class="left">   &lt;http://www.iana.org/assignments/http-cache-directives&gt;.</td><td> </td><td class="right">   &lt;http://www.iana.org/assignments/http-cache-directives&gt;.</td><td class="lineno" valign="top"></td></tr>
    15491550      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1550       <tr><td><a name="diff0142" /></td></tr>
     1551      <tr><td><a name="diff0143" /></td></tr>
    15511552      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.3.  Expires</td><td> </td><td class="rblock"><span class="insert">7</span>.3.  Expires</td><td class="lineno" valign="top"></td></tr>
    15521553      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    15531554      <tr><td class="lineno" valign="top"></td><td class="left">   The "Expires" header field gives the date/time after which the</td><td> </td><td class="right">   The "Expires" header field gives the date/time after which the</td><td class="lineno" valign="top"></td></tr>
    1554       <tr><td><a name="diff0143" /></td></tr>
     1555      <tr><td><a name="diff0144" /></td></tr>
    15551556      <tr><td class="lineno" valign="top"></td><td class="lblock">   response is considered stale.  See Section <span class="delete">2.3</span> for further discussion</td><td> </td><td class="rblock">   response is considered stale.  See Section <span class="insert">4.1</span> for further discussion</td><td class="lineno" valign="top"></td></tr>
    15561557      <tr><td class="lineno" valign="top"></td><td class="left">   of the freshness model.</td><td> </td><td class="right">   of the freshness model.</td><td class="lineno" valign="top"></td></tr>
     
    15611562      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    15621563      <tr><td class="lineno" valign="top"></td><td class="left">   The field-value is an absolute date and time as defined by HTTP-date</td><td> </td><td class="right">   The field-value is an absolute date and time as defined by HTTP-date</td><td class="lineno" valign="top"></td></tr>
    1563       <tr><td><a name="diff0144" /></td></tr>
     1564      <tr><td><a name="diff0145" /></td></tr>
    15641565      <tr><td class="lineno" valign="top"></td><td class="lblock">   in Section <span class="delete">8</span> of [Part2]; a sender MUST use the rfc1123-date format.</td><td> </td><td class="rblock">   in Section <span class="insert">5.1</span> of [Part2]; a sender MUST use the rfc1123-date format.</td><td class="lineno" valign="top"></td></tr>
    15651566      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    15741575      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    15751576      <tr><td class="lineno" valign="top"></td><td class="left">      Note: If a response includes a Cache-Control field with the max-</td><td> </td><td class="right">      Note: If a response includes a Cache-Control field with the max-</td><td class="lineno" valign="top"></td></tr>
    1576       <tr><td><a name="diff0145" /></td></tr>
     1577      <tr><td><a name="diff0146" /></td></tr>
    15771578      <tr><td class="lineno" valign="top"></td><td class="lblock">      age directive (see Section <span class="delete">3.2.2),</span> that directive overrides the</td><td> </td><td class="rblock">      age directive (see Section <span class="insert">7.2.2.7),</span> that directive overrides the</td><td class="lineno" valign="top"></td></tr>
    15781579      <tr><td class="lineno" valign="top"></td><td class="lblock">      Expires field.  Likewise, the s-maxage directive overrides Expires</td><td> </td><td class="rblock">      Expires field.  Likewise, the s-maxage directive <span class="insert">(Section 7.2.2.8)</span></td><td class="lineno" valign="top"></td></tr>
     
    15831584      <tr><td class="lineno" valign="top"></td><td class="left">   longer prohibited, extremely large values have been demonstrated to</td><td> </td><td class="right">   longer prohibited, extremely large values have been demonstrated to</td><td class="lineno" valign="top"></td></tr>
    15841585      <tr><td class="lineno" valign="top"></td><td class="left">   cause problems (e.g., clock overflows due to use of 32-bit integers</td><td> </td><td class="right">   cause problems (e.g., clock overflows due to use of 32-bit integers</td><td class="lineno" valign="top"></td></tr>
    1585       <tr><td><a name="diff0146" /></td></tr>
     1586      <tr><td><a name="diff0147" /></td></tr>
    15861587      <tr><td class="lineno" valign="top"></td><td class="lblock">   for time values), and m<span class="delete">ost</span> caches will evict a response far sooner</td><td> </td><td class="rblock">   for time values), and m<span class="insert">any</span> caches will evict a response far sooner</td><td class="lineno" valign="top"></td></tr>
    15871588      <tr><td class="lineno" valign="top"></td><td class="left">   than that.  Therefore, senders ought not produce them.</td><td> </td><td class="right">   than that.  Therefore, senders ought not produce them.</td><td class="lineno" valign="top"></td></tr>
     
    15941595      <tr><td class="lineno" valign="top"></td><td class="left">   separate Expires values for each resource).</td><td> </td><td class="right">   separate Expires values for each resource).</td><td class="lineno" valign="top"></td></tr>
    15951596      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1596       <tr><td><a name="diff0147" /></td></tr>
     1597      <tr><td><a name="diff0148" /></td></tr>
    15971598      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.4.  Pragma</td><td> </td><td class="rblock"><span class="insert">7</span>.4.  Pragma</td><td class="lineno" valign="top"></td></tr>
    15981599      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    16001601      <tr><td class="lineno" valign="top"></td><td class="left">   HTTP/1.0 caches, so that clients can specify a "no-cache" request</td><td> </td><td class="right">   HTTP/1.0 caches, so that clients can specify a "no-cache" request</td><td class="lineno" valign="top"></td></tr>
    16011602      <tr><td class="lineno" valign="top"></td><td class="left">   that they will understand (as Cache-Control was not defined until</td><td> </td><td class="right">   that they will understand (as Cache-Control was not defined until</td><td class="lineno" valign="top"></td></tr>
    1602       <tr><td><a name="diff0148" /></td></tr>
     1603      <tr><td><a name="diff0149" /></td></tr>
    16031604      <tr><td class="lineno" valign="top"></td><td class="lblock">   HTTP/1.1).  When the Cache-Control header is also present and</td><td> </td><td class="rblock">   HTTP/1.1).  When the Cache-Control header <span class="insert">field </span>is also present and</td><td class="lineno" valign="top"></td></tr>
    16041605      <tr><td class="lineno" valign="top"></td><td class="left">   understood in a request, Pragma is ignored.</td><td> </td><td class="right">   understood in a request, Pragma is ignored.</td><td class="lineno" valign="top"></td></tr>
     
    16121613      <tr><td class="lineno" valign="top"></td><td class="left">     extension-pragma = token [ "=" ( token / quoted-string ) ]</td><td> </td><td class="right">     extension-pragma = token [ "=" ( token / quoted-string ) ]</td><td class="lineno" valign="top"></td></tr>
    16131614      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1614       <tr><td><a name="diff0149" /></td></tr>
     1615      <tr><td><a name="diff0150" /></td></tr>
    16151616      <tr><td class="lineno" valign="top"></td><td class="lblock">   When the Cache-Control header is not present in a request, the <span class="delete">no-</span></td><td> </td><td class="rblock">   When the Cache-Control header <span class="insert">field</span> is not present in a request, the</td><td class="lineno" valign="top"></td></tr>
    16161617      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   cache</span> request pragma-directive MUST have the same effect on caches as</td><td> </td><td class="rblock">   <span class="insert">no-cache</span> request pragma-directive MUST have the same effect on caches</td><td class="lineno" valign="top"></td></tr>
     
    16351636      <tr><td class="lineno" valign="top"></td><td class="left">      "Cache-Control: no-cache" in them.</td><td> </td><td class="right">      "Cache-Control: no-cache" in them.</td><td class="lineno" valign="top"></td></tr>
    16361637      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1637       <tr><td><a name="diff0150" /></td></tr>
     1638      <tr><td><a name="diff0151" /></td></tr>
    16381639      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.5.  Vary</td><td> </td><td class="rblock"><span class="insert">7</span>.5.  Vary</td><td class="lineno" valign="top"></td></tr>
    16391640      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    16421643      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    16431644      <tr><td class="lineno" valign="top"></td><td class="left">   Caches use this information, in part, to determine whether a stored</td><td> </td><td class="right">   Caches use this information, in part, to determine whether a stored</td><td class="lineno" valign="top"></td></tr>
    1644       <tr><td><a name="diff0151" /></td></tr>
     1645      <tr><td><a name="diff0152" /></td></tr>
    16451646      <tr><td class="lineno" valign="top"></td><td class="lblock">   response can be used to satisfy a given request; see Section <span class="delete">2.8.</span></td><td> </td><td class="rblock">   response can be used to satisfy a given request; see Section <span class="insert">4.3.</span></td><td class="lineno" valign="top"></td></tr>
    16461647      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   determines, while the response is fresh, whether a cache is permitted</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    16691670      <tr><td class="lineno" valign="top"></td><td class="left">   insensitive.</td><td> </td><td class="right">   insensitive.</td><td class="lineno" valign="top"></td></tr>
    16701671      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1671       <tr><td><a name="diff0152" /></td></tr>
     1672      <tr><td><a name="diff0153" /></td></tr>
    16721673      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.  Warning</td><td> </td><td class="rblock"><span class="insert">7</span>.6.  Warning</td><td class="lineno" valign="top"></td></tr>
    16731674      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    16931694      <tr><td class="lineno" valign="top"></td><td class="left">   Systems that generate multiple Warning header fields are encouraged</td><td> </td><td class="right">   Systems that generate multiple Warning header fields are encouraged</td><td class="lineno" valign="top"></td></tr>
    16941695      <tr><td class="lineno" valign="top"></td><td class="left">   to order them with this user agent behavior in mind.  New Warning</td><td> </td><td class="right">   to order them with this user agent behavior in mind.  New Warning</td><td class="lineno" valign="top"></td></tr>
    1695       <tr><td><a name="diff0153" /></td></tr>
     1696      <tr><td><a name="diff0154" /></td></tr>
    16961697      <tr><td class="lineno" valign="top"></td><td class="lblock">   header fields are added after any existing Warning header<span class="delete">s</span> fields.</td><td> </td><td class="rblock">   header fields are added after any existing Warning header fields.</td><td class="lineno" valign="top"></td></tr>
    16971698      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17171718      <tr><td class="lineno" valign="top"></td><td class="left">   a recommended warn-text in English, and a description of its meaning.</td><td> </td><td class="right">   a recommended warn-text in English, and a description of its meaning.</td><td class="lineno" valign="top"></td></tr>
    17181719      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1719       <tr><td><a name="diff0154" /></td></tr>
     1720      <tr><td><a name="diff0155" /></td></tr>
    17201721      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.1.  110 Response is Stale</td><td> </td><td class="rblock"><span class="insert">7</span>.6.1.  110 Response is Stale</td><td class="lineno" valign="top"></td></tr>
    17211722      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    17221723      <tr><td class="lineno" valign="top"></td><td class="left">   A cache SHOULD include this whenever the returned response is stale.</td><td> </td><td class="right">   A cache SHOULD include this whenever the returned response is stale.</td><td class="lineno" valign="top"></td></tr>
    17231724      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1724       <tr><td><a name="diff0155" /></td></tr>
     1725      <tr><td><a name="diff0156" /></td></tr>
    17251726      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.2.  111 Revalidation Failed</td><td> </td><td class="rblock"><span class="insert">7</span>.6.2.  111 Revalidation Failed</td><td class="lineno" valign="top"></td></tr>
    17261727      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17291730      <tr><td class="lineno" valign="top"></td><td class="left">   reach the server.</td><td> </td><td class="right">   reach the server.</td><td class="lineno" valign="top"></td></tr>
    17301731      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1731       <tr><td><a name="diff0156" /></td></tr>
     1732      <tr><td><a name="diff0157" /></td></tr>
    17321733      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.3.  112 Disconnected Operation</td><td> </td><td class="rblock"><span class="insert">7</span>.6.3.  112 Disconnected Operation</td><td class="lineno" valign="top"></td></tr>
    17331734      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17351736      <tr><td class="lineno" valign="top"></td><td class="left">   the rest of the network for a period of time.</td><td> </td><td class="right">   the rest of the network for a period of time.</td><td class="lineno" valign="top"></td></tr>
    17361737      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1737       <tr><td><a name="diff0157" /></td></tr>
     1738      <tr><td><a name="diff0158" /></td></tr>
    17381739      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.4.  113 Heuristic Expiration</td><td> </td><td class="rblock"><span class="insert">7</span>.6.4.  113 Heuristic Expiration</td><td class="lineno" valign="top"></td></tr>
    17391740      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17421743      <tr><td class="lineno" valign="top"></td><td class="left">   24 hours.</td><td> </td><td class="right">   24 hours.</td><td class="lineno" valign="top"></td></tr>
    17431744      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1744       <tr><td><a name="diff0158" /></td></tr>
     1745      <tr><td><a name="diff0159" /></td></tr>
    17451746      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.5.  199 Miscellaneous Warning</td><td> </td><td class="rblock"><span class="insert">7</span>.6.5.  199 Miscellaneous Warning</td><td class="lineno" valign="top"></td></tr>
    17461747      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17501751      <tr><td class="lineno" valign="top"></td><td class="left">   user.</td><td> </td><td class="right">   user.</td><td class="lineno" valign="top"></td></tr>
    17511752      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1752       <tr><td><a name="diff0159" /></td></tr>
     1753      <tr><td><a name="diff0160" /></td></tr>
    17531754      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.6.  214 Transformation Applied</td><td> </td><td class="rblock"><span class="insert">7</span>.6.6.  214 Transformation Applied</td><td class="lineno" valign="top"></td></tr>
    17541755      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17581759      <tr><td class="lineno" valign="top"></td><td class="left">   appears in the response.</td><td> </td><td class="right">   appears in the response.</td><td class="lineno" valign="top"></td></tr>
    17591760      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1760       <tr><td><a name="diff0160" /></td></tr>
     1761      <tr><td><a name="diff0161" /></td></tr>
    17611762      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.7.  299 Miscellaneous Persistent Warning</td><td> </td><td class="rblock"><span class="insert">7</span>.6.7.  299 Miscellaneous Persistent Warning</td><td class="lineno" valign="top"></td></tr>
    17621763      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17651766      <tr><td class="lineno" valign="top"></td><td class="left">   take any automated action.</td><td> </td><td class="right">   take any automated action.</td><td class="lineno" valign="top"></td></tr>
    17661767      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1767       <tr><td><a name="diff0161" /></td></tr>
     1768      <tr><td><a name="diff0162" /></td></tr>
    17681769      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">3</span>.6.8.  Warn Code Extensions</td><td> </td><td class="rblock"><span class="insert">7</span>.6.8.  Warn Code Extensions</td><td class="lineno" valign="top"></td></tr>
    17691770      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17751776      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    17761777      <tr><td class="lineno" valign="top"></td><td class="left">   o  Short Description</td><td> </td><td class="right">   o  Short Description</td><td class="lineno" valign="top"></td></tr>
    1777       <tr><td><a name="diff0162" /></td></tr>
     1778      <tr><td><a name="diff0163" /></td></tr>
    17781779      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">                                                                         </span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    17791780      <tr><td class="lineno" valign="top"></td><td class="left">   o  Pointer to specification text</td><td> </td><td class="right">   o  Pointer to specification text</td><td class="lineno" valign="top"></td></tr>
     
    17851786      <tr><td class="lineno" valign="top"></td><td class="left">   &lt;http://www.iana.org/assignments/http-warn-codes&gt;.</td><td> </td><td class="right">   &lt;http://www.iana.org/assignments/http-warn-codes&gt;.</td><td class="lineno" valign="top"></td></tr>
    17861787      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1787       <tr><td><a name="diff0163" /></td></tr>
     1788      <tr><td><a name="diff0164" /></td></tr>
    17881789      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">4</span>.  History Lists</td><td> </td><td class="rblock"><span class="insert">8</span>.  History Lists</td><td class="lineno" valign="top"></td></tr>
    17891790      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    17921793      <tr><td class="lineno" valign="top"></td><td class="left">   retrieved earlier in a session.</td><td> </td><td class="right">   retrieved earlier in a session.</td><td class="lineno" valign="top"></td></tr>
    17931794      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1794       <tr><td><a name="diff0164" /></td></tr>
     1795      <tr><td><a name="diff0165" /></td></tr>
    17951796      <tr><td class="lineno" valign="top"></td><td class="lblock">   The freshness model (Section <span class="delete">2.3</span>) does not necessarily apply to</td><td> </td><td class="rblock">   The freshness model (Section <span class="insert">4.1</span>) does not necessarily apply to</td><td class="lineno" valign="top"></td></tr>
    17961797      <tr><td class="lineno" valign="top"></td><td class="left">   history mechanisms.  I.e., a history mechanism can display a previous</td><td> </td><td class="right">   history mechanisms.  I.e., a history mechanism can display a previous</td><td class="lineno" valign="top"></td></tr>
     
    18011802      <tr><td class="lineno" valign="top"></td><td class="left">   Cache-Control: no-store).</td><td> </td><td class="right">   Cache-Control: no-store).</td><td class="lineno" valign="top"></td></tr>
    18021803      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1803       <tr><td><a name="diff0165" /></td></tr>
     1804      <tr><td><a name="diff0166" /></td></tr>
    18041805      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">5</span>.  IANA Considerations</td><td> </td><td class="rblock"><span class="insert">9</span>.  IANA Considerations</td><td class="lineno" valign="top"></td></tr>
    18051806      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1806       <tr><td><a name="diff0166" /></td></tr>
     1807      <tr><td><a name="diff0167" /></td></tr>
    18071808      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">5</span>.1.  Cache Directive Registry</td><td> </td><td class="rblock"><span class="insert">9</span>.1.  Cache Directive Registry</td><td class="lineno" valign="top"></td></tr>
    18081809      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    18091810      <tr><td class="lineno" valign="top"></td><td class="left">   The registration procedure for HTTP Cache Directives is defined by</td><td> </td><td class="right">   The registration procedure for HTTP Cache Directives is defined by</td><td class="lineno" valign="top"></td></tr>
    1810       <tr><td><a name="diff0167" /></td></tr>
     1811      <tr><td><a name="diff0168" /></td></tr>
    18111812      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">3</span>.2.3 of this document.</td><td> </td><td class="rblock">   Section <span class="insert">7</span>.2.3 of this document.</td><td class="lineno" valign="top"></td></tr>
    18121813      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    18151816      <tr><td class="lineno" valign="top"></td><td class="left">   populated with the registrations below:</td><td> </td><td class="right">   populated with the registrations below:</td><td class="lineno" valign="top"></td></tr>
    18161817      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1817       <tr><td><a name="diff0168" /></td></tr>
     1818      <tr><td><a name="diff0169" /></td></tr>
    18181819      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">+------------------------+------------------------------+</span></td><td> </td><td class="rblock">   <span class="insert">+------------------------+----------------------------------+</span></td><td class="lineno" valign="top"></td></tr>
    18191820      <tr><td class="lineno" valign="top"></td><td class="lblock">   | Cache Directive        | Reference                    |</td><td> </td><td class="rblock">   | Cache Directive        | Reference                        |</td><td class="lineno" valign="top"></td></tr>
     
    18351836      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">+------------------------+------------------------------+</span></td><td> </td><td class="rblock">   <span class="insert">+------------------------+----------------------------------+</span></td><td class="lineno" valign="top"></td></tr>
    18361837      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1837       <tr><td><a name="diff0169" /></td></tr>
     1838      <tr><td><a name="diff0170" /></td></tr>
    18381839      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">5</span>.2.  Warn Code Registry</td><td> </td><td class="rblock"><span class="insert">9</span>.2.  Warn Code Registry</td><td class="lineno" valign="top"></td></tr>
    18391840      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    18401841      <tr><td class="lineno" valign="top"></td><td class="left">   The registration procedure for HTTP Warn Codes is defined by</td><td> </td><td class="right">   The registration procedure for HTTP Warn Codes is defined by</td><td class="lineno" valign="top"></td></tr>
    1841       <tr><td><a name="diff0170" /></td></tr>
     1842      <tr><td><a name="diff0171" /></td></tr>
    18421843      <tr><td class="lineno" valign="top"></td><td class="lblock">   Section <span class="delete">3</span>.6.8 of this document.</td><td> </td><td class="rblock">   Section <span class="insert">7</span>.6.8 of this document.</td><td class="lineno" valign="top"></td></tr>
    18431844      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    18491850      <tr><td class="lineno" valign="top"></td><td class="left">   | Warn Code | Short Description                | Reference     |</td><td> </td><td class="right">   | Warn Code | Short Description                | Reference     |</td><td class="lineno" valign="top"></td></tr>
    18501851      <tr><td class="lineno" valign="top"></td><td class="left">   +-----------+----------------------------------+---------------+</td><td> </td><td class="right">   +-----------+----------------------------------+---------------+</td><td class="lineno" valign="top"></td></tr>
    1851       <tr><td><a name="diff0171" /></td></tr>
     1852      <tr><td><a name="diff0172" /></td></tr>
    18521853      <tr><td class="lineno" valign="top"></td><td class="lblock">   | 110       | Response is Stale                | Section <span class="delete">3.6.1</span> |</td><td> </td><td class="rblock">   | 110       | Response is Stale                | Section <span class="insert">7.6.1</span> |</td><td class="lineno" valign="top"></td></tr>
    18531854      <tr><td class="lineno" valign="top"></td><td class="lblock">   | 111       | Revalidation Failed              | Section <span class="delete">3.6.2</span> |</td><td> </td><td class="rblock">   | 111       | Revalidation Failed              | Section <span class="insert">7.6.2</span> |</td><td class="lineno" valign="top"></td></tr>
     
    18591860      <tr><td class="lineno" valign="top"></td><td class="left">   +-----------+----------------------------------+---------------+</td><td> </td><td class="right">   +-----------+----------------------------------+---------------+</td><td class="lineno" valign="top"></td></tr>
    18601861      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1861       <tr><td><a name="diff0172" /></td></tr>
     1862      <tr><td><a name="diff0173" /></td></tr>
    18621863      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">5</span>.3.  Header Field Registration</td><td> </td><td class="rblock"><span class="insert">9</span>.3.  Header Field Registration</td><td class="lineno" valign="top"></td></tr>
    18631864      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    18691870      <tr><td class="lineno" valign="top"></td><td class="left">   | Header Field Name | Protocol | Status   | Reference   |</td><td> </td><td class="right">   | Header Field Name | Protocol | Status   | Reference   |</td><td class="lineno" valign="top"></td></tr>
    18701871      <tr><td class="lineno" valign="top"></td><td class="left">   +-------------------+----------+----------+-------------+</td><td> </td><td class="right">   +-------------------+----------+----------+-------------+</td><td class="lineno" valign="top"></td></tr>
    1871       <tr><td><a name="diff0173" /></td></tr>
     1872      <tr><td><a name="diff0174" /></td></tr>
    18721873      <tr><td class="lineno" valign="top"></td><td class="lblock">   | Age               | http     | standard | Section <span class="delete">3.1</span> |</td><td> </td><td class="rblock">   | Age               | http     | standard | Section <span class="insert">7.1</span> |</td><td class="lineno" valign="top"></td></tr>
    18731874      <tr><td class="lineno" valign="top"></td><td class="lblock">   | Cache-Control     | http     | standard | Section <span class="delete">3.2</span> |</td><td> </td><td class="rblock">   | Cache-Control     | http     | standard | Section <span class="insert">7.2</span> |</td><td class="lineno" valign="top"></td></tr>
     
    18811882      <tr><td class="lineno" valign="top"></td><td class="left">   Engineering Task Force".</td><td> </td><td class="right">   Engineering Task Force".</td><td class="lineno" valign="top"></td></tr>
    18821883      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1883       <tr><td><a name="diff0174" /></td></tr>
     1884      <tr><td><a name="diff0175" /></td></tr>
    18841885      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">6</span>.  Security Considerations</td><td> </td><td class="rblock"><span class="insert">10</span>.  Security Considerations</td><td class="lineno" valign="top"></td></tr>
    18851886      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    18921893      <tr><td class="lineno" valign="top"></td><td class="left">   information.</td><td> </td><td class="right">   information.</td><td class="lineno" valign="top"></td></tr>
    18931894      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1894       <tr><td><a name="diff0175" /></td></tr>
     1895      <tr><td><a name="diff0176" /></td></tr>
    18951896      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">7</span>.  Acknowledgments</td><td> </td><td class="rblock"><span class="insert">11</span>.  Acknowledgments</td><td class="lineno" valign="top"></td></tr>
    18961897      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    18971898      <tr><td class="lineno" valign="top"></td><td class="left">   See Section 9 of [Part1].</td><td> </td><td class="right">   See Section 9 of [Part1].</td><td class="lineno" valign="top"></td></tr>
    18981899      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1899       <tr><td><a name="diff0176" /></td></tr>
     1900      <tr><td><a name="diff0177" /></td></tr>
    19001901      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">8.</span>  References</td><td> </td><td class="rblock"><span class="insert">12.</span>  References</td><td class="lineno" valign="top"></td></tr>
    19011902      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">8.1.</span>  Normative References</td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
     
    19031904      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19041905      <tr><td class="lineno" valign="top"></td><td class="left">   [Part1]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part1]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    1905       <tr><td><a name="diff0177" /></td></tr>
     1906      <tr><td><a name="diff0178" /></td></tr>
    19061907      <tr><td class="lineno" valign="top"></td><td class="lblock">              "HTTP/1.1, part 1: <span class="delete">URIs, Connections, and</span> Message</td><td> </td><td class="rblock">              "HTTP/1.1, part 1: Message <span class="insert">Routing and Syntax"",</span></td><td class="lineno" valign="top"></td></tr>
    19071908      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">Parsing", draft-ietf-httpbis-p1-messaging-19</span> (work in</td><td> </td><td class="rblock"><span class="insert">              draft-ietf-httpbis-p1-messaging-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
     
    19091910      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19101911      <tr><td class="lineno" valign="top"></td><td class="left">   [Part2]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part2]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    1911       <tr><td><a name="diff0178" /></td></tr>
     1912      <tr><td><a name="diff0179" /></td></tr>
    19121913      <tr><td class="lineno" valign="top"></td><td class="lblock">              "HTTP/1.1, part 2: <span class="delete">Message Semantics",</span></td><td> </td><td class="rblock">              "HTTP/1.1, part 2: <span class="insert">Semantics and Payloads",</span></td><td class="lineno" valign="top"></td></tr>
    19131914      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">              draft-ietf-httpbis-p2-semantics-19</span> (work in progress),</td><td> </td><td class="rblock"><span class="insert">              draft-ietf-httpbis-p2-semantics-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
     
    19161917      <tr><td class="lineno" valign="top"></td><td class="left">   [Part4]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part4]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    19171918      <tr><td class="lineno" valign="top"></td><td class="left">              "HTTP/1.1, part 4: Conditional Requests",</td><td> </td><td class="right">              "HTTP/1.1, part 4: Conditional Requests",</td><td class="lineno" valign="top"></td></tr>
    1918       <tr><td><a name="diff0179" /></td></tr>
     1919      <tr><td><a name="diff0180" /></td></tr>
    19191920      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p4-conditional-19</span> (work in progress),</td><td> </td><td class="rblock">              <span class="insert">draft-ietf-httpbis-p4-conditional-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
    19201921      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">March</span> 2012.</td><td> </td><td class="rblock">              <span class="insert">July</span> 2012.</td><td class="lineno" valign="top"></td></tr>
    19211922      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19221923      <tr><td class="lineno" valign="top"></td><td class="left">   [Part5]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part5]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    1923       <tr><td><a name="diff0180" /></td></tr>
     1924      <tr><td><a name="diff0181" /></td></tr>
    19241925      <tr><td class="lineno" valign="top"></td><td class="lblock">              "HTTP/1.1, part 5: Range <span class="delete">Requests and Partial Responses",</span></td><td> </td><td class="rblock">              "HTTP/1.1, part 5: Range <span class="insert">Requests",</span></td><td class="lineno" valign="top"></td></tr>
    19251926      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">              draft-ietf-httpbis-p5-range-19</span> (work in progress),</td><td> </td><td class="rblock"><span class="insert">              draft-ietf-httpbis-p5-range-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
     
    19281929      <tr><td class="lineno" valign="top"></td><td class="left">   [Part7]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part7]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    19291930      <tr><td class="lineno" valign="top"></td><td class="left">              "HTTP/1.1, part 7: Authentication",</td><td> </td><td class="right">              "HTTP/1.1, part 7: Authentication",</td><td class="lineno" valign="top"></td></tr>
    1930       <tr><td><a name="diff0181" /></td></tr>
     1931      <tr><td><a name="diff0182" /></td></tr>
    19311932      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p7-auth-19</span> (work in progress),</td><td> </td><td class="rblock">              <span class="insert">draft-ietf-httpbis-p7-auth-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
    19321933      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">March</span> 2012.</td><td> </td><td class="rblock">              <span class="insert">July</span> 2012.</td><td class="lineno" valign="top"></td></tr>
     
    19381939      <tr><td class="lineno" valign="top"></td><td class="left">              Specifications: ABNF", STD 68, RFC 5234, January 2008.</td><td> </td><td class="right">              Specifications: ABNF", STD 68, RFC 5234, January 2008.</td><td class="lineno" valign="top"></td></tr>
    19391940      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1940       <tr><td><a name="diff0182" /></td></tr>
     1941      <tr><td><a name="diff0183" /></td></tr>
    19411942      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">8</span>.2.  Informative References</td><td> </td><td class="rblock"><span class="insert">12</span>.2.  Informative References</td><td class="lineno" valign="top"></td></tr>
    19421943      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    19621963      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19631964      <tr><td class="lineno" valign="top"></td><td class="left">   Make the specified age calculation algorithm less conservative.</td><td> </td><td class="right">   Make the specified age calculation algorithm less conservative.</td><td class="lineno" valign="top"></td></tr>
    1964       <tr><td><a name="diff0183" /></td></tr>
     1965      <tr><td><a name="diff0184" /></td></tr>
    19651966      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">2.3.2</span>)</td><td> </td><td class="rblock">   (Section <span class="insert">4.1.3</span>)</td><td class="lineno" valign="top"></td></tr>
    19661967      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19671968      <tr><td class="lineno" valign="top"></td><td class="left">   Remove requirement to consider Content-Location in successful</td><td> </td><td class="right">   Remove requirement to consider Content-Location in successful</td><td class="lineno" valign="top"></td></tr>
    19681969      <tr><td class="lineno" valign="top"></td><td class="left">   responses in order to determine the appropriate response to use.</td><td> </td><td class="right">   responses in order to determine the appropriate response to use.</td><td class="lineno" valign="top"></td></tr>
    1969       <tr><td><a name="diff0184" /></td></tr>
     1970      <tr><td><a name="diff0185" /></td></tr>
    19701971      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">2.4</span>)</td><td> </td><td class="rblock">   (Section <span class="insert">4.2</span>)</td><td class="lineno" valign="top"></td></tr>
    19711972      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1972       <tr><td><a name="diff0185" /></td></tr>
     1973      <tr><td><a name="diff0186" /></td></tr>
    19731974      <tr><td class="lineno" valign="top"></td><td class="lblock">   Clarify denial of service attack avoidance requirement.</td><td> </td><td class="rblock">   Clarify denial of service attack avoidance requirement.  (Section <span class="insert">6)</span></td><td class="lineno" valign="top"></td></tr>
    19741975      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">2.6)</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    19751976      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    19761977      <tr><td class="lineno" valign="top"></td><td class="left">   Change ABNF productions for header fields to only define the field</td><td> </td><td class="right">   Change ABNF productions for header fields to only define the field</td><td class="lineno" valign="top"></td></tr>
    1977       <tr><td><a name="diff0186" /></td></tr>
     1978      <tr><td><a name="diff0187" /></td></tr>
    19781979      <tr><td class="lineno" valign="top"></td><td class="lblock">   value.  (Section <span class="delete">3)</span></td><td> </td><td class="rblock">   value.  (Section <span class="insert">7)</span></td><td class="lineno" valign="top"></td></tr>
    19791980      <tr><td class="lineno" valign="top"></td><td class="lblock">                                                                         </td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    19801981      <tr><td class="lineno" valign="top"></td><td class="left">   Do not mention RFC 2047 encoding and multiple languages in Warning</td><td> </td><td class="right">   Do not mention RFC 2047 encoding and multiple languages in Warning</td><td class="lineno" valign="top"></td></tr>
    19811982      <tr><td class="lineno" valign="top"></td><td class="left">   header fields anymore, as these aspects never were implemented.</td><td> </td><td class="right">   header fields anymore, as these aspects never were implemented.</td><td class="lineno" valign="top"></td></tr>
    1982       <tr><td><a name="diff0187" /></td></tr>
     1983      <tr><td><a name="diff0188" /></td></tr>
    19831984      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section <span class="delete">3</span>.6)</td><td> </td><td class="rblock">   (Section <span class="insert">7</span>.6)</td><td class="lineno" valign="top"></td></tr>
    19841985      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1985       <tr><td><a name="diff0188" /></td></tr>
     1986      <tr><td><a name="diff0189" /></td></tr>
    19861987      <tr><td class="lineno" valign="top"></td><td class="lblock">Appendix B.  Collected ABNF</td><td> </td><td class="rblock">   <span class="insert">Introduce Cache Directive and Warn Code Registries.  (Section 7.2.3</span></td><td class="lineno" valign="top"></td></tr>
    19871988      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   and Section 7.6.8)</span></td><td class="lineno" valign="top"></td></tr>
     
    20202021      <tr><td class="lineno" valign="top"></td><td class="left">   Expires = HTTP-date</td><td> </td><td class="right">   Expires = HTTP-date</td><td class="lineno" valign="top"></td></tr>
    20212022      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2022       <tr><td><a name="diff0189" /></td></tr>
     2023      <tr><td><a name="diff0190" /></td></tr>
    20232024      <tr><td class="lineno" valign="top"></td><td class="lblock">   HTTP-date = &lt;HTTP-date, defined in [Part2], Section <span class="delete">8</span>&gt;</td><td> </td><td class="rblock">   HTTP-date = &lt;HTTP-date, defined in [Part2], Section <span class="insert">5.1</span>&gt;</td><td class="lineno" valign="top"></td></tr>
    20242025      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    20342035      <tr><td class="lineno" valign="top"></td><td class="left">    )</td><td> </td><td class="right">    )</td><td class="lineno" valign="top"></td></tr>
    20352036      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2036       <tr><td><a name="diff0190" /></td></tr>
     2037      <tr><td><a name="diff0191" /></td></tr>
    20372038      <tr><td class="lineno" valign="top"></td><td class="lblock">   cache-directive = <span class="delete">cache-request-directive / cache-response-directive</span></td><td> </td><td class="rblock">   cache-directive = token [ "=" ( token / quoted-string ) ]</td><td class="lineno" valign="top"></td></tr>
    20382039      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   cache-extension =</span> token [ "=" ( token / quoted-string ) ]</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    20542055      <tr><td class="lineno" valign="top"></td><td class="left">   field-name = &lt;field-name, defined in [Part1], Section 3.2&gt;</td><td> </td><td class="right">   field-name = &lt;field-name, defined in [Part1], Section 3.2&gt;</td><td class="lineno" valign="top"></td></tr>
    20552056      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2056       <tr><td><a name="diff0191" /></td></tr>
     2057      <tr><td><a name="diff0192" /></td></tr>
    20572058      <tr><td class="lineno" valign="top"></td><td class="lblock">   port = &lt;port, defined in [Part1], Section 2.<span class="delete">7</span>&gt;</td><td> </td><td class="rblock">   port = &lt;port, defined in [Part1], Section 2.<span class="insert">8</span>&gt;</td><td class="lineno" valign="top"></td></tr>
    20582059      <tr><td class="lineno" valign="top"></td><td class="left">   pragma-directive = "no-cache" / extension-pragma</td><td> </td><td class="right">   pragma-directive = "no-cache" / extension-pragma</td><td class="lineno" valign="top"></td></tr>
     
    20632064      <tr><td class="lineno" valign="top"></td><td class="left">   token = &lt;token, defined in [Part1], Section 3.2.4&gt;</td><td> </td><td class="right">   token = &lt;token, defined in [Part1], Section 3.2.4&gt;</td><td class="lineno" valign="top"></td></tr>
    20642065      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2065       <tr><td><a name="diff0192" /></td></tr>
     2066      <tr><td><a name="diff0193" /></td></tr>
    20662067      <tr><td class="lineno" valign="top"></td><td class="lblock">   uri-host = &lt;uri-host, defined in [Part1], Section 2.<span class="delete">7</span>&gt;</td><td> </td><td class="rblock">   uri-host = &lt;uri-host, defined in [Part1], Section 2.<span class="insert">8</span>&gt;</td><td class="lineno" valign="top"></td></tr>
    20672068      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    20732074      <tr><td class="lineno" valign="top"></td><td class="left">    ]</td><td> </td><td class="right">    ]</td><td class="lineno" valign="top"></td></tr>
    20742075      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2075       <tr><td><a name="diff0193" /></td></tr>
     2076      <tr><td><a name="diff0194" /></td></tr>
    20762077      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">ABNF diagnostics:</span></td><td> </td><td class="rblock">Appendix <span class="insert">D.</span>  Change Log (to be removed by RFC Editor before publication)</td><td class="lineno" valign="top"></td></tr>
    20772078      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    23412342      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      HTTP's error-handling philosophy"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    23422343      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2343       <tr><td><a name="diff0194" /></td></tr>
     2344      <tr><td><a name="diff0195" /></td></tr>
    23442345      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/317&gt;: "Cache-Control</span></td><td> </td><td class="rblock">   <span class="insert">Changes up to the first Working Group Last Call draft are summarized</span></td><td class="lineno" valign="top"></td></tr>
    23452346      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      directive case sensitivity"</span></td><td> </td><td class="rblock"><span class="insert">   in &lt;http://trac.tools.ietf.org/html/</span></td><td class="lineno" valign="top"></td></tr>
    23462347      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   draft-ietf-httpbis-p6-cache-19#appendix-C&gt;.</span></td><td class="lineno" valign="top"></td></tr>
    23472348      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2348       <tr><td><a name="diff0195" /></td></tr>
     2349      <tr><td><a name="diff0196" /></td></tr>
    23492350      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">C.19.  Since draft-ietf-httpbis-p6-cache-17</span></td><td> </td><td class="rblock"><span class="insert">D.1.  Since draft-ietf-httpbis-p6-cache-19</span></td><td class="lineno" valign="top"></td></tr>
    23502351      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    23512352      <tr><td class="lineno" valign="top"></td><td class="left">   Closed issues:</td><td> </td><td class="right">   Closed issues:</td><td class="lineno" valign="top"></td></tr>
    23522353      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2353       <tr><td><a name="diff0196" /></td></tr>
     2354      <tr><td><a name="diff0197" /></td></tr>
    23542355      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/293&gt;: "Interaction</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/307&gt;: "untangle</span></td><td class="lineno" valign="top"></td></tr>
    23552356      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      of request and response Cache-Control"</span></td><td> </td><td class="rblock"><span class="insert">      Cache-Control ABNF"</span></td><td class="lineno" valign="top"></td></tr>
    23562357      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2357       <tr><td><a name="diff0197" /></td></tr>
     2358      <tr><td><a name="diff0198" /></td></tr>
    23582359      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/212&gt;: "Refining age</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/353&gt;: "Multiple</span></td><td class="lineno" valign="top"></td></tr>
    23592360      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      for 1.1 proxy chains"</span></td><td> </td><td class="rblock"><span class="insert">      values in Cache-Control header fields"</span></td><td class="lineno" valign="top"></td></tr>
    23602361      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2361       <tr><td><a name="diff0198" /></td></tr>
     2362      <tr><td><a name="diff0199" /></td></tr>
    23622363      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/274&gt;: "warn-code</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/355&gt;: "Case</span></td><td class="lineno" valign="top"></td></tr>
    23632364      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      registry"</span></td><td> </td><td class="rblock"><span class="insert">      sensitivity of header fields in CC values"</span></td><td class="lineno" valign="top"></td></tr>
    23642365      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2365       <tr><td><a name="diff0199" /></td></tr>
     2366      <tr><td><a name="diff0200" /></td></tr>
    23662367      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">C.20.  Since draft-ietf-httpbis-p6-cache-18</span></td><td> </td><td class="rblock">   <span class="insert">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/356&gt;: "Spurious</span></td><td class="lineno" valign="top"></td></tr>
    23672368      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      'MAYs'"</span></td><td class="lineno" valign="top"></td></tr>
    23682369      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2369       <tr><td><a name="diff0200" /></td></tr>
     2370      <tr><td><a name="diff0201" /></td></tr>
    23702371      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Closed issues:</span></td><td> </td><td class="rblock">   <span class="insert">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/360&gt;: "enhance</span></td><td class="lineno" valign="top"></td></tr>
    23712372      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      considerations for new cache control directives"</span></td><td class="lineno" valign="top"></td></tr>
    23722373      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2373       <tr><td><a name="diff0201" /></td></tr>
     2374      <tr><td><a name="diff0202" /></td></tr>
    23742375      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/227&gt;: "Combining</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/361&gt;: "ABNF</span></td><td class="lineno" valign="top"></td></tr>
    23752376      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      HEAD responses"</span></td><td> </td><td class="rblock"><span class="insert">      requirements for recipients"</span></td><td class="lineno" valign="top"></td></tr>
    23762377      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2377       <tr><td><a name="diff0202" /></td></tr>
     2378      <tr><td><a name="diff0203" /></td></tr>
    23782379      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/337&gt;: "Field names</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/368&gt;: "note</span></td><td class="lineno" valign="top"></td></tr>
    23792380      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      in cache-control header arguments"</span></td><td> </td><td class="rblock"><span class="insert">      introduction of new IANA registries as normative changes"</span></td><td class="lineno" valign="top"></td></tr>
     
    23832384      <tr><td class="lineno" valign="top"></td><td class="left">   1</td><td> </td><td class="right">   1</td><td class="lineno" valign="top"></td></tr>
    23842385      <tr><td class="lineno" valign="top"></td><td class="left">      110 Response is Stale (warn code)  31</td><td> </td><td class="right">      110 Response is Stale (warn code)  31</td><td class="lineno" valign="top"></td></tr>
    2385       <tr><td><a name="diff0203" /></td></tr>
     2386      <tr><td><a name="diff0204" /></td></tr>
    23862387      <tr><td class="lineno" valign="top"></td><td class="lblock">      111 Revalidation Failed (warn code)  <span class="delete">31</span></td><td> </td><td class="rblock">      111 Revalidation Failed (warn code)  <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
    23872388      <tr><td class="lineno" valign="top"></td><td class="lblock">      112 Disconnected Operation (warn code)  <span class="delete">31</span></td><td> </td><td class="rblock">      112 Disconnected Operation (warn code)  <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
     
    23942395      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    23952396      <tr><td class="lineno" valign="top"></td><td class="left">   A</td><td> </td><td class="right">   A</td><td class="lineno" valign="top"></td></tr>
    2396       <tr><td><a name="diff0204" /></td></tr>
     2397      <tr><td><a name="diff0205" /></td></tr>
    23972398      <tr><td class="lineno" valign="top"></td><td class="lblock">      age  <span class="delete">6</span></td><td> </td><td class="rblock">      age  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    23982399      <tr><td class="lineno" valign="top"></td><td class="lblock">      Age header field  <span class="delete">21</span></td><td> </td><td class="rblock">      Age header field  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    23992400      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    24002401      <tr><td class="lineno" valign="top"></td><td class="left">   C</td><td> </td><td class="right">   C</td><td class="lineno" valign="top"></td></tr>
    2401       <tr><td><a name="diff0205" /></td></tr>
     2402      <tr><td><a name="diff0206" /></td></tr>
    24022403      <tr><td class="lineno" valign="top"></td><td class="lblock">      cache  <span class="delete">5</span></td><td> </td><td class="rblock">      cache  <span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
    24032404      <tr><td class="lineno" valign="top"></td><td class="left">      Cache Directives</td><td> </td><td class="right">      Cache Directives</td><td class="lineno" valign="top"></td></tr>
    2404       <tr><td><a name="diff0206" /></td></tr>
     2405      <tr><td><a name="diff0207" /></td></tr>
    24052406      <tr><td class="lineno" valign="top"></td><td class="lblock">         max-age  <span class="delete">23, 26</span></td><td> </td><td class="rblock">         max-age  <span class="insert">22, 25</span></td><td class="lineno" valign="top"></td></tr>
    24062407      <tr><td class="lineno" valign="top"></td><td class="lblock">         max-stale  <span class="delete">23</span></td><td> </td><td class="rblock">         max-stale  <span class="insert">22</span></td><td class="lineno" valign="top"></td></tr>
    24072408      <tr><td class="lineno" valign="top"></td><td class="lblock">         min-fresh  <span class="delete">23</span></td><td> </td><td class="rblock">         min-fresh  <span class="insert">22</span></td><td class="lineno" valign="top"></td></tr>
    24082409      <tr><td class="lineno" valign="top"></td><td class="left">         must-revalidate  25</td><td> </td><td class="right">         must-revalidate  25</td><td class="lineno" valign="top"></td></tr>
    2409       <tr><td><a name="diff0207" /></td></tr>
     2410      <tr><td><a name="diff0208" /></td></tr>
    24102411      <tr><td class="lineno" valign="top"></td><td class="lblock">         no-cache  <span class="delete">22,</span> 24</td><td> </td><td class="rblock">         no-cache  <span class="insert">21,</span> 24</td><td class="lineno" valign="top"></td></tr>
    24112412      <tr><td class="lineno" valign="top"></td><td class="lblock">         no-store  <span class="delete">22,</span> 25</td><td> </td><td class="rblock">         no-store  <span class="insert">21,</span> 25</td><td class="lineno" valign="top"></td></tr>
    24122413      <tr><td class="lineno" valign="top"></td><td class="left">         no-transform  23, 26</td><td> </td><td class="right">         no-transform  23, 26</td><td class="lineno" valign="top"></td></tr>
    24132414      <tr><td class="lineno" valign="top"></td><td class="left">         only-if-cached  23</td><td> </td><td class="right">         only-if-cached  23</td><td class="lineno" valign="top"></td></tr>
    2414       <tr><td><a name="diff0208" /></td></tr>
     2415      <tr><td><a name="diff0209" /></td></tr>
    24152416      <tr><td class="lineno" valign="top"></td><td class="lblock">         private  <span class="delete">24</span></td><td> </td><td class="rblock">         private  <span class="insert">23</span></td><td class="lineno" valign="top"></td></tr>
    24162417      <tr><td class="lineno" valign="top"></td><td class="lblock">         proxy-revalidate  <span class="delete">26</span></td><td> </td><td class="rblock">         proxy-revalidate  <span class="insert">25</span></td><td class="lineno" valign="top"></td></tr>
    24172418      <tr><td class="lineno" valign="top"></td><td class="lblock">         public  <span class="delete">24</span></td><td> </td><td class="rblock">         public  <span class="insert">23</span></td><td class="lineno" valign="top"></td></tr>
    24182419      <tr><td class="lineno" valign="top"></td><td class="left">         s-maxage  26</td><td> </td><td class="right">         s-maxage  26</td><td class="lineno" valign="top"></td></tr>
    2419       <tr><td><a name="diff0209" /></td></tr>
     2420      <tr><td><a name="diff0210" /></td></tr>
    24202421      <tr><td class="lineno" valign="top"></td><td class="lblock">      cache entry  <span class="delete">8</span></td><td> </td><td class="rblock">      cache entry  <span class="insert">7</span></td><td class="lineno" valign="top"></td></tr>
    24212422      <tr><td class="lineno" valign="top"></td><td class="lblock">      cache key  <span class="delete">8</span></td><td> </td><td class="rblock">      cache key  <span class="insert">7</span></td><td class="lineno" valign="top"></td></tr>
     
    24242425      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    24252426      <tr><td class="lineno" valign="top"></td><td class="left">   E</td><td> </td><td class="right">   E</td><td class="lineno" valign="top"></td></tr>
    2426       <tr><td><a name="diff0210" /></td></tr>
     2427      <tr><td><a name="diff0211" /></td></tr>
    24272428      <tr><td class="lineno" valign="top"></td><td class="lblock">      Expires header field  <span class="delete">27</span></td><td> </td><td class="rblock">      Expires header field  <span class="insert">28</span></td><td class="lineno" valign="top"></td></tr>
    24282429      <tr><td class="lineno" valign="top"></td><td class="lblock">      explicit expiration time  <span class="delete">6</span></td><td> </td><td class="rblock">      explicit expiration time  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    24292430      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    24302431      <tr><td class="lineno" valign="top"></td><td class="left">   F</td><td> </td><td class="right">   F</td><td class="lineno" valign="top"></td></tr>
    2431       <tr><td><a name="diff0211" /></td></tr>
     2432      <tr><td><a name="diff0212" /></td></tr>
    24322433      <tr><td class="lineno" valign="top"></td><td class="lblock">      first-hand  <span class="delete">6</span></td><td> </td><td class="rblock">      first-hand  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    24332434      <tr><td class="lineno" valign="top"></td><td class="lblock">      fresh  <span class="delete">6</span></td><td> </td><td class="rblock">      fresh  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
     
    24362437      <tr><td class="lineno" valign="top"></td><td class="left">   G</td><td> </td><td class="right">   G</td><td class="lineno" valign="top"></td></tr>
    24372438      <tr><td class="lineno" valign="top"></td><td class="left">      Grammar</td><td> </td><td class="right">      Grammar</td><td class="lineno" valign="top"></td></tr>
    2438       <tr><td><a name="diff0212" /></td></tr>
     2439      <tr><td><a name="diff0213" /></td></tr>
    24392440      <tr><td class="lineno" valign="top"></td><td class="lblock">         Age  <span class="delete">21</span></td><td> </td><td class="rblock">         Age  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    24402441      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache-Control  <span class="delete">22</span></td><td> </td><td class="rblock">         Cache-Control  <span class="insert">21</span></td><td class="lineno" valign="top"></td></tr>
     
    24442445      <tr><td class="lineno" valign="top"></td><td class="lblock">         delta-seconds  <span class="delete">8</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    24452446      <tr><td class="lineno" valign="top"></td><td class="left">         Expires  28</td><td> </td><td class="right">         Expires  28</td><td class="lineno" valign="top"></td></tr>
    2446       <tr><td><a name="diff0213" /></td></tr>
     2447      <tr><td><a name="diff0214" /></td></tr>
    24472448      <tr><td class="lineno" valign="top"></td><td class="lblock">         extension-pragma  <span class="delete">28</span></td><td> </td><td class="rblock">         extension-pragma  <span class="insert">29</span></td><td class="lineno" valign="top"></td></tr>
    24482449      <tr><td class="lineno" valign="top"></td><td class="lblock">         Pragma  <span class="delete">28</span></td><td> </td><td class="rblock">         Pragma  <span class="insert">29</span></td><td class="lineno" valign="top"></td></tr>
     
    24582459      <tr><td class="lineno" valign="top"></td><td class="left">   H</td><td> </td><td class="right">   H</td><td class="lineno" valign="top"></td></tr>
    24592460      <tr><td class="lineno" valign="top"></td><td class="left">      Header Fields</td><td> </td><td class="right">      Header Fields</td><td class="lineno" valign="top"></td></tr>
    2460       <tr><td><a name="diff0214" /></td></tr>
     2461      <tr><td><a name="diff0215" /></td></tr>
    24612462      <tr><td class="lineno" valign="top"></td><td class="lblock">         Age  <span class="delete">21</span></td><td> </td><td class="rblock">         Age  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    24622463      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache-Control  <span class="delete">21</span></td><td> </td><td class="rblock">         Cache-Control  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
     
    24652466      <tr><td class="lineno" valign="top"></td><td class="left">         Vary  29</td><td> </td><td class="right">         Vary  29</td><td class="lineno" valign="top"></td></tr>
    24662467      <tr><td class="lineno" valign="top"></td><td class="left">         Warning  30</td><td> </td><td class="right">         Warning  30</td><td class="lineno" valign="top"></td></tr>
    2467       <tr><td><a name="diff0215" /></td></tr>
     2468      <tr><td><a name="diff0216" /></td></tr>
    24682469      <tr><td class="lineno" valign="top"></td><td class="lblock">      heuristic expiration time  <span class="delete">6</span></td><td> </td><td class="rblock">      heuristic expiration time  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    24692470      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    24702471      <tr><td class="lineno" valign="top"></td><td class="left">   M</td><td> </td><td class="right">   M</td><td class="lineno" valign="top"></td></tr>
    24712472      <tr><td class="lineno" valign="top"></td><td class="left">      max-age</td><td> </td><td class="right">      max-age</td><td class="lineno" valign="top"></td></tr>
    2472       <tr><td><a name="diff0216" /></td></tr>
     2473      <tr><td><a name="diff0217" /></td></tr>
    24732474      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">3, 26</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">2, 25</span></td><td class="lineno" valign="top"></td></tr>
    24742475      <tr><td class="lineno" valign="top"></td><td class="left">      max-stale</td><td> </td><td class="right">      max-stale</td><td class="lineno" valign="top"></td></tr>
    2475       <tr><td><a name="diff0217" /></td></tr>
     2476      <tr><td><a name="diff0218" /></td></tr>
    24762477      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">3</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    24772478      <tr><td class="lineno" valign="top"></td><td class="left">      min-fresh</td><td> </td><td class="right">      min-fresh</td><td class="lineno" valign="top"></td></tr>
    2478       <tr><td><a name="diff0218" /></td></tr>
     2479      <tr><td><a name="diff0219" /></td></tr>
    24792480      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">3</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    24802481      <tr><td class="lineno" valign="top"></td><td class="left">      must-revalidate</td><td> </td><td class="right">      must-revalidate</td><td class="lineno" valign="top"></td></tr>
     
    24832484      <tr><td class="lineno" valign="top"></td><td class="left">   N</td><td> </td><td class="right">   N</td><td class="lineno" valign="top"></td></tr>
    24842485      <tr><td class="lineno" valign="top"></td><td class="left">      no-cache</td><td> </td><td class="right">      no-cache</td><td class="lineno" valign="top"></td></tr>
    2485       <tr><td><a name="diff0219" /></td></tr>
     2486      <tr><td><a name="diff0220" /></td></tr>
    24862487      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">2</span>, 24</td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">1</span>, 24</td><td class="lineno" valign="top"></td></tr>
    24872488      <tr><td class="lineno" valign="top"></td><td class="left">      no-store</td><td> </td><td class="right">      no-store</td><td class="lineno" valign="top"></td></tr>
    2488       <tr><td><a name="diff0220" /></td></tr>
     2489      <tr><td><a name="diff0221" /></td></tr>
    24892490      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">2</span>, 25</td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">1</span>, 25</td><td class="lineno" valign="top"></td></tr>
    24902491      <tr><td class="lineno" valign="top"></td><td class="left">      no-transform</td><td> </td><td class="right">      no-transform</td><td class="lineno" valign="top"></td></tr>
     
    24982499      <tr><td class="lineno" valign="top"></td><td class="left">      Pragma header field  28</td><td> </td><td class="right">      Pragma header field  28</td><td class="lineno" valign="top"></td></tr>
    24992500      <tr><td class="lineno" valign="top"></td><td class="left">      private</td><td> </td><td class="right">      private</td><td class="lineno" valign="top"></td></tr>
    2500       <tr><td><a name="diff0221" /></td></tr>
     2501      <tr><td><a name="diff0222" /></td></tr>
    25012502      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  <span class="delete">24</span></td><td> </td><td class="rblock">         Cache Directive  <span class="insert">23</span></td><td class="lineno" valign="top"></td></tr>
    25022503      <tr><td class="lineno" valign="top"></td><td class="lblock">      private cache  <span class="delete">5</span></td><td> </td><td class="rblock">      private cache  <span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
    25032504      <tr><td class="lineno" valign="top"></td><td class="left">      proxy-revalidate</td><td> </td><td class="right">      proxy-revalidate</td><td class="lineno" valign="top"></td></tr>
    2504       <tr><td><a name="diff0222" /></td></tr>
     2505      <tr><td><a name="diff0223" /></td></tr>
    25052506      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">6</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    25062507      <tr><td class="lineno" valign="top"></td><td class="left">      public</td><td> </td><td class="right">      public</td><td class="lineno" valign="top"></td></tr>
    2507       <tr><td><a name="diff0223" /></td></tr>
     2508      <tr><td><a name="diff0224" /></td></tr>
    25082509      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">4</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">3</span></td><td class="lineno" valign="top"></td></tr>
    25092510      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    25112512      <tr><td class="lineno" valign="top"></td><td class="left">      s-maxage</td><td> </td><td class="right">      s-maxage</td><td class="lineno" valign="top"></td></tr>
    25122513      <tr><td class="lineno" valign="top"></td><td class="left">         Cache Directive  26</td><td> </td><td class="right">         Cache Directive  26</td><td class="lineno" valign="top"></td></tr>
    2513       <tr><td><a name="diff0224" /></td></tr>
     2514      <tr><td><a name="diff0225" /></td></tr>
    25142515      <tr><td class="lineno" valign="top"></td><td class="lblock">      shared cache  <span class="delete">5</span></td><td> </td><td class="rblock">      shared cache  <span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
    25152516      <tr><td class="lineno" valign="top"></td><td class="lblock">      stale  <span class="delete">6</span></td><td> </td><td class="rblock">      stale  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
     
    25172518      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    25182519      <tr><td class="lineno" valign="top"></td><td class="left">   V</td><td> </td><td class="right">   V</td><td class="lineno" valign="top"></td></tr>
    2519       <tr><td><a name="diff0225" /></td></tr>
     2520      <tr><td><a name="diff0226" /></td></tr>
    25202521      <tr><td class="lineno" valign="top"></td><td class="lblock">      validator  <span class="delete">6</span></td><td> </td><td class="rblock">      validator  <span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    25212522      <tr><td class="lineno" valign="top"></td><td class="lblock">         strong  <span class="delete">7</span></td><td> </td><td class="rblock">         strong  <span class="insert">6</span></td><td class="lineno" valign="top"></td></tr>
     
    25252526      <tr><td class="lineno" valign="top"></td><td class="left">      Warn Codes</td><td> </td><td class="right">      Warn Codes</td><td class="lineno" valign="top"></td></tr>
    25262527      <tr><td class="lineno" valign="top"></td><td class="left">         110 Response is Stale  31</td><td> </td><td class="right">         110 Response is Stale  31</td><td class="lineno" valign="top"></td></tr>
    2527       <tr><td><a name="diff0226" /></td></tr>
     2528      <tr><td><a name="diff0227" /></td></tr>
    25282529      <tr><td class="lineno" valign="top"></td><td class="lblock">         111 Revalidation Failed  <span class="delete">31</span></td><td> </td><td class="rblock">         111 Revalidation Failed  <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
    25292530      <tr><td class="lineno" valign="top"></td><td class="lblock">         112 Disconnected Operation  <span class="delete">31</span></td><td> </td><td class="rblock">         112 Disconnected Operation  <span class="insert">32</span></td><td class="lineno" valign="top"></td></tr>
     
    25502551      <tr><td class="lineno" valign="top"></td><td class="left">   EMail: mnot@mnot.net</td><td> </td><td class="right">   EMail: mnot@mnot.net</td><td class="lineno" valign="top"></td></tr>
    25512552      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://www.mnot.net/</td><td> </td><td class="right">   URI:   http://www.mnot.net/</td><td class="lineno" valign="top"></td></tr>
    2552       <tr><td><a name="diff0227" /></td></tr>
     2553      <tr><td><a name="diff0228" /></td></tr>
    25532554      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">                                                                         </span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    25542555      <tr><td class="lineno" valign="top"></td><td class="left">   Julian F. Reschke (editor)</td><td> </td><td class="right">   Julian F. Reschke (editor)</td><td class="lineno" valign="top"></td></tr>
     
    25582559      <tr><td class="lineno" valign="top"></td><td class="left">   Germany</td><td> </td><td class="right">   Germany</td><td class="lineno" valign="top"></td></tr>
    25592560      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    2560       <tr><td><a name="diff0228" /></td></tr>
     2561      <tr><td><a name="diff0229" /></td></tr>
    25612562      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Phone: +49 251 2807760</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    25622563      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Fax:   +49 251 2807761</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    25652566
    25662567     <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
    2567      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 228 change blocks.&nbsp;</a></th></tr>
    2568      <tr class="stats"><td></td><th><i>914 lines changed or deleted</i></th><th><i> </i></th><th><i>691 lines changed or added</i></th><td></td></tr>
     2568     <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 229 change blocks.&nbsp;</a></th></tr>
     2569     <tr class="stats"><td></td><th><i>922 lines changed or deleted</i></th><th><i> </i></th><th><i>693 lines changed or added</i></th><td></td></tr>
    25692570     <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>
    25702571   </table>
  • draft-ietf-httpbis/diffs/draft-ietf-httpbis-p7-auth-20-from-19.diff.html

    r1807 r1809  
    5555      <tr><td class="lineno" valign="top"></td><td class="left">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td> </td><td class="right">   The Hypertext Transfer Protocol (HTTP) is an application-level</td><td class="lineno" valign="top"></td></tr>
    5656      <tr><td class="lineno" valign="top"></td><td class="left">   protocol for distributed, collaborative, hypermedia information</td><td> </td><td class="right">   protocol for distributed, collaborative, hypermedia information</td><td class="lineno" valign="top"></td></tr>
    57       <tr><td class="lineno" valign="top"></td><td class="left">   systems.  HTTP has been in use by the World Wide Web global</td><td> </td><td class="right">   systems.  HTTP has been in use by the World Wide Web global</td><td class="lineno" valign="top"></td></tr>
    58       <tr><td class="lineno" valign="top"></td><td class="left">   information initiative since 1990.  This document is Part 7 of the</td><td> </td><td class="right">   information initiative since 1990.  This document is Part 7 of the</td><td class="lineno" valign="top"></td></tr>
    59       <tr><td class="lineno" valign="top"></td><td class="left">   seven-part specification that defines the protocol referred to as</td><td> </td><td class="right">   seven-part specification that defines the protocol referred to as</td><td class="lineno" valign="top"></td></tr>
    60       <tr><td class="lineno" valign="top"></td><td class="left">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td> </td><td class="right">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</td><td class="lineno" valign="top"></td></tr>
    61       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    62       <tr><td class="lineno" valign="top"></td><td class="left">   Part 7 defines the HTTP Authentication framework.</td><td> </td><td class="right">   Part 7 defines the HTTP Authentication framework.</td><td class="lineno" valign="top"></td></tr>
     57      <tr><td><a name="diff0003" /></td></tr>
     58      <tr><td class="lineno" valign="top"></td><td class="lblock">   systems.  <span class="delete">HTTP has been in use by the World Wide Web global</span></td><td> </td><td class="rblock">   systems.  This document defines the HTTP Authentication framework.</td><td class="lineno" valign="top"></td></tr>
     59      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   information initiative since 1990.</span>  This document <span class="delete">is Part 7 of the</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     60      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   seven-part specification that defines the protocol referred to as</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     61      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   "HTTP/1.1" and, taken together, obsoletes RFC 2616.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     62      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     63      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Part 7</span> defines the HTTP Authentication framework.</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    6364      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    6465      <tr><td class="lineno" valign="top"></td><td class="left">Editorial Note (To be removed by RFC Editor)</td><td> </td><td class="right">Editorial Note (To be removed by RFC Editor)</td><td class="lineno" valign="top"></td></tr>
    6566      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    66       <tr><td><a name="diff0003" /></td></tr>
     67      <tr><td><a name="diff0004" /></td></tr>
    6768      <tr><td class="lineno" valign="top"></td><td class="lblock">   Discussion of this draft <span class="delete">should take</span> place on the HTTPBIS working</td><td> </td><td class="rblock">   Discussion of this draft <span class="insert">takes</span> place on the HTTPBIS working group</td><td class="lineno" valign="top"></td></tr>
    6869      <tr><td class="lineno" valign="top"></td><td class="lblock">   group mailing list (ietf-http-wg@w3.org), which is archived at</td><td> </td><td class="rblock">   mailing list (ietf-http-wg@w3.org), which is archived at</td><td class="lineno" valign="top"></td></tr>
     
    7475      <tr><td class="lineno" valign="top"></td><td class="left">   &lt;http://tools.ietf.org/wg/httpbis/&gt;.</td><td> </td><td class="right">   &lt;http://tools.ietf.org/wg/httpbis/&gt;.</td><td class="lineno" valign="top"></td></tr>
    7576      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    76       <tr><td><a name="diff0004" /></td></tr>
     77      <tr><td><a name="diff0005" /></td></tr>
    7778      <tr><td class="lineno" valign="top"></td><td class="lblock">   The changes in this draft are summarized in Appendix <span class="delete">C.20</span>.</td><td> </td><td class="rblock">   The changes in this draft are summarized in Appendix <span class="insert">D.1</span>.</td><td class="lineno" valign="top"></td></tr>
    7879      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    9293      <tr><td class="lineno" valign="top"></td><td class="left">   material or to cite them other than as "work in progress."</td><td> </td><td class="right">   material or to cite them other than as "work in progress."</td><td class="lineno" valign="top"></td></tr>
    9394      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    94       <tr><td><a name="diff0005" /></td></tr>
     95      <tr><td><a name="diff0006" /></td></tr>
    9596      <tr><td class="lineno" valign="top"></td><td class="lblock">   This Internet-Draft will expire on <span class="delete">September 13, 2012</span>.</td><td> </td><td class="rblock">   This Internet-Draft will expire on <span class="insert">January 17, 2013</span>.</td><td class="lineno" valign="top"></td></tr>
    9697      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    116117      <tr><td class="lineno" valign="top"></td><td class="left">   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4</td><td> </td><td class="right">   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4</td><td class="lineno" valign="top"></td></tr>
    117118      <tr><td class="lineno" valign="top"></td><td class="left">     1.1.  Conformance and Error Handling . . . . . . . . . . . . . .  4</td><td> </td><td class="right">     1.1.  Conformance and Error Handling . . . . . . . . . . . . . .  4</td><td class="lineno" valign="top"></td></tr>
    118       <tr><td><a name="diff0006" /></td></tr>
     119      <tr><td><a name="diff0007" /></td></tr>
    119120      <tr><td class="lineno" valign="top"></td><td class="lblock">     1.2.  Syntax Notation  . . . . . . . . . . . . . . . . . . . . .  <span class="delete">4</span></td><td> </td><td class="rblock">     1.2.  Syntax Notation  . . . . . . . . . . . . . . . . . . . . .  5</td><td class="lineno" valign="top"></td></tr>
    120121      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       1.2.1.  Core Rules . . . . . . . . . . . . . . . . . . . . . .</span>  5</td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    122123      <tr><td class="lineno" valign="top"></td><td class="left">     2.1.  Challenge and Response . . . . . . . . . . . . . . . . . .  5</td><td> </td><td class="right">     2.1.  Challenge and Response . . . . . . . . . . . . . . . . . .  5</td><td class="lineno" valign="top"></td></tr>
    123124      <tr><td class="lineno" valign="top"></td><td class="left">     2.2.  Protection Space (Realm) . . . . . . . . . . . . . . . . .  7</td><td> </td><td class="right">     2.2.  Protection Space (Realm) . . . . . . . . . . . . . . . . .  7</td><td class="lineno" valign="top"></td></tr>
    124       <tr><td><a name="diff0007" /></td></tr>
     125      <tr><td><a name="diff0008" /></td></tr>
    125126      <tr><td class="lineno" valign="top"></td><td class="lblock">     2.3.  Authentication Scheme Registry . . . . . . . . . . . . . .  <span class="delete">7</span></td><td> </td><td class="rblock">     2.3.  Authentication Scheme Registry . . . . . . . . . . . . . .  <span class="insert">8</span></td><td class="lineno" valign="top"></td></tr>
    126127      <tr><td class="lineno" valign="top"></td><td class="left">       2.3.1.  Considerations for New Authentication Schemes  . . . .  8</td><td> </td><td class="right">       2.3.1.  Considerations for New Authentication Schemes  . . . .  8</td><td class="lineno" valign="top"></td></tr>
    127128      <tr><td class="lineno" valign="top"></td><td class="left">   3.  Status Code Definitions  . . . . . . . . . . . . . . . . . . .  9</td><td> </td><td class="right">   3.  Status Code Definitions  . . . . . . . . . . . . . . . . . . .  9</td><td class="lineno" valign="top"></td></tr>
    128129      <tr><td class="lineno" valign="top"></td><td class="left">     3.1.  401 Unauthorized . . . . . . . . . . . . . . . . . . . . .  9</td><td> </td><td class="right">     3.1.  401 Unauthorized . . . . . . . . . . . . . . . . . . . . .  9</td><td class="lineno" valign="top"></td></tr>
    129       <tr><td><a name="diff0008" /></td></tr>
     130      <tr><td><a name="diff0009" /></td></tr>
    130131      <tr><td class="lineno" valign="top"></td><td class="lblock">     3.2.  407 Proxy Authentication Required  . . . . . . . . . . . . <span class="delete"> 9</span></td><td> </td><td class="rblock">     3.2.  407 Proxy Authentication Required  . . . . . . . . . . . . <span class="insert">10</span></td><td class="lineno" valign="top"></td></tr>
    131132      <tr><td class="lineno" valign="top"></td><td class="left">   4.  Header Field Definitions . . . . . . . . . . . . . . . . . . . 10</td><td> </td><td class="right">   4.  Header Field Definitions . . . . . . . . . . . . . . . . . . . 10</td><td class="lineno" valign="top"></td></tr>
     
    133134      <tr><td class="lineno" valign="top"></td><td class="left">     4.2.  Proxy-Authenticate . . . . . . . . . . . . . . . . . . . . 11</td><td> </td><td class="right">     4.2.  Proxy-Authenticate . . . . . . . . . . . . . . . . . . . . 11</td><td class="lineno" valign="top"></td></tr>
    134135      <tr><td class="lineno" valign="top"></td><td class="left">     4.3.  Proxy-Authorization  . . . . . . . . . . . . . . . . . . . 11</td><td> </td><td class="right">     4.3.  Proxy-Authorization  . . . . . . . . . . . . . . . . . . . 11</td><td class="lineno" valign="top"></td></tr>
    135       <tr><td><a name="diff0009" /></td></tr>
     136      <tr><td><a name="diff0010" /></td></tr>
    136137      <tr><td class="lineno" valign="top"></td><td class="lblock">     4.4.  WWW-Authenticate . . . . . . . . . . . . . . . . . . . . . 1<span class="delete">1</span></td><td> </td><td class="rblock">     4.4.  WWW-Authenticate . . . . . . . . . . . . . . . . . . . . . 1<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    137138      <tr><td class="lineno" valign="top"></td><td class="left">   5.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 12</td><td> </td><td class="right">   5.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 12</td><td class="lineno" valign="top"></td></tr>
    138       <tr><td><a name="diff0010" /></td></tr>
     139      <tr><td><a name="diff0011" /></td></tr>
    139140      <tr><td class="lineno" valign="top"></td><td class="lblock">     5.1.  <span class="delete">Authenticaton</span> Scheme Registry  . . . . . . . . . . . . . . 12</td><td> </td><td class="rblock">     5.1.  <span class="insert">Authentication</span> Scheme Registry . . . . . . . . . . . . . . 12</td><td class="lineno" valign="top"></td></tr>
    140141      <tr><td class="lineno" valign="top"></td><td class="lblock">     5.2.  Status Code Registration . . . . . . . . . . . . . . . . . <span class="delete">12</span></td><td> </td><td class="rblock">     5.2.  Status Code Registration . . . . . . . . . . . . . . . . . <span class="insert">13</span></td><td class="lineno" valign="top"></td></tr>
     
    142143      <tr><td class="lineno" valign="top"></td><td class="left">   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 13</td><td> </td><td class="right">   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 13</td><td class="lineno" valign="top"></td></tr>
    143144      <tr><td class="lineno" valign="top"></td><td class="left">     6.1.  Authentication Credentials and Idle Clients  . . . . . . . 13</td><td> </td><td class="right">     6.1.  Authentication Credentials and Idle Clients  . . . . . . . 13</td><td class="lineno" valign="top"></td></tr>
    144       <tr><td><a name="diff0011" /></td></tr>
     145      <tr><td><a name="diff0012" /></td></tr>
    145146      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     6.2.  Protection Spaces  . . . . . . . . . . . . . . . . . . . . 14</span></td><td class="lineno" valign="top"></td></tr>
    146147      <tr><td class="lineno" valign="top"></td><td class="left">   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 14</td><td> </td><td class="right">   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 14</td><td class="lineno" valign="top"></td></tr>
    147       <tr><td><a name="diff0012" /></td></tr>
     148      <tr><td><a name="diff0013" /></td></tr>
    148149      <tr><td class="lineno" valign="top"></td><td class="lblock">   8.  References . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="delete">14</span></td><td> </td><td class="rblock">   8.  References . . . . . . . . . . . . . . . . . . . . . . . . . . <span class="insert">15</span></td><td class="lineno" valign="top"></td></tr>
    149150      <tr><td class="lineno" valign="top"></td><td class="lblock">     8.1.  Normative References . . . . . . . . . . . . . . . . . . . <span class="delete">14</span></td><td> </td><td class="rblock">     8.1.  Normative References . . . . . . . . . . . . . . . . . . . <span class="insert">15</span></td><td class="lineno" valign="top"></td></tr>
     
    178179      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    179180      <tr><td class="lineno" valign="top"></td><td class="left">   This document defines HTTP/1.1 access control and authentication.  It</td><td> </td><td class="right">   This document defines HTTP/1.1 access control and authentication.  It</td><td class="lineno" valign="top"></td></tr>
    180       <tr><td><a name="diff0013" /></td></tr>
     181      <tr><td><a name="diff0014" /></td></tr>
    181182      <tr><td class="lineno" valign="top"></td><td class="lblock">   includes the relevant parts of RFC 2616 with only minor <span class="delete">changes,</span> plus</td><td> </td><td class="rblock">   includes the relevant parts of RFC 2616 with only minor <span class="insert">changes</span></td><td class="lineno" valign="top"></td></tr>
    182183      <tr><td class="lineno" valign="top"></td><td class="lblock">   the general framework for HTTP authentication, as previously defined</td><td> </td><td class="rblock"><span class="insert">   ([RFC2616]),</span> plus the general framework for HTTP authentication, as</td><td class="lineno" valign="top"></td></tr>
     
    196197      <tr><td class="lineno" valign="top"></td><td class="left">   document are to be interpreted as described in [RFC2119].</td><td> </td><td class="right">   document are to be interpreted as described in [RFC2119].</td><td class="lineno" valign="top"></td></tr>
    197198      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    198       <tr><td><a name="diff0014" /></td></tr>
     199      <tr><td><a name="diff0015" /></td></tr>
    199200      <tr><td class="lineno" valign="top"></td><td class="lblock">   This <span class="delete">document defines</span> conformance criteria <span class="delete">for several roles</span> in HTTP</td><td> </td><td class="rblock">   This <span class="insert">specification targets</span> conformance criteria <span class="insert">according to the role</span></td><td class="lineno" valign="top"></td></tr>
    200201      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">communication, including Senders, Recipients, Clients, Servers, User-</span></td><td> </td><td class="rblock"><span class="insert">   of a participant</span> in HTTP <span class="insert">communication.  Hence, HTTP requirements are</span></td><td class="lineno" valign="top"></td></tr>
     
    209210      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    210211      <tr><td class="lineno" valign="top"></td><td class="left">   An implementation is considered conformant if it complies with all of</td><td> </td><td class="right">   An implementation is considered conformant if it complies with all of</td><td class="lineno" valign="top"></td></tr>
    211       <tr><td><a name="diff0015" /></td></tr>
     212      <tr><td><a name="diff0016" /></td></tr>
    212213      <tr><td class="lineno" valign="top"></td><td class="lblock">   the requirements associated with <span class="delete">its role(s).</span>  Note that SHOULD-level</td><td> </td><td class="rblock">   the requirements associated with <span class="insert">the roles it partakes in HTTP.</span>  Note</td><td class="lineno" valign="top"></td></tr>
    213214      <tr><td class="lineno" valign="top"></td><td class="lblock">   requirements are relevant here, unless one of the documented</td><td> </td><td class="rblock">   that SHOULD-level requirements are relevant here, unless one of the</td><td class="lineno" valign="top"></td></tr>
     
    216217      <tr><td class="lineno" valign="top"></td><td class="left">   This document also uses ABNF to define valid protocol elements</td><td> </td><td class="right">   This document also uses ABNF to define valid protocol elements</td><td class="lineno" valign="top"></td></tr>
    217218      <tr><td class="lineno" valign="top"></td><td class="left">   (Section 1.2).  In addition to the prose requirements placed upon</td><td> </td><td class="right">   (Section 1.2).  In addition to the prose requirements placed upon</td><td class="lineno" valign="top"></td></tr>
    218       <tr><td><a name="diff0016" /></td></tr>
     219      <tr><td><a name="diff0017" /></td></tr>
    219220      <tr><td class="lineno" valign="top"></td><td class="lblock">   them, <span class="delete">Senders</span> MUST NOT generate protocol elements that are <span class="delete">invalid.</span></td><td> </td><td class="rblock">   them, <span class="insert">senders</span> MUST NOT generate protocol elements that <span class="insert">do not match</span></td><td class="lineno" valign="top"></td></tr>
    220221      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   the grammar defined by the ABNF rules for those protocol elements</span></td><td class="lineno" valign="top"></td></tr>
     
    224225      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   only those rules not applicable to the recipient's role.</span></td><td class="lineno" valign="top"></td></tr>
    225226      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    226       <tr><td><a name="diff0017" /></td></tr>
     227      <tr><td><a name="diff0018" /></td></tr>
    227228      <tr><td class="lineno" valign="top"></td><td class="lblock">   Unless noted otherwise, <span class="delete">Recipients</span> MAY <span class="delete">take steps</span> to recover a usable</td><td> </td><td class="rblock">   Unless noted otherwise, <span class="insert">a recipient</span> MAY <span class="insert">attempt</span> to recover a usable</td><td class="lineno" valign="top"></td></tr>
    228229      <tr><td class="lineno" valign="top"></td><td class="lblock">   protocol element from an invalid construct.  <span class="delete">However,</span> HTTP does not</td><td> </td><td class="rblock">   protocol element from an invalid construct.  HTTP does not define</td><td class="lineno" valign="top"></td></tr>
     
    239240      <tr><td class="lineno" valign="top"></td><td class="left">   This specification uses the Augmented Backus-Naur Form (ABNF)</td><td> </td><td class="right">   This specification uses the Augmented Backus-Naur Form (ABNF)</td><td class="lineno" valign="top"></td></tr>
    240241      <tr><td class="lineno" valign="top"></td><td class="left">   notation of [RFC5234] with the list rule extension defined in Section</td><td> </td><td class="right">   notation of [RFC5234] with the list rule extension defined in Section</td><td class="lineno" valign="top"></td></tr>
    241       <tr><td><a name="diff0018" /></td></tr>
     242      <tr><td><a name="diff0019" /></td></tr>
    242243      <tr><td class="lineno" valign="top"></td><td class="lblock">   1.2 of [Part1].  Appendix B shows the collected ABNF with the list</td><td> </td><td class="rblock">   1.2 of [Part1].  Appendix B <span class="insert">describes rules imported from other</span></td><td class="lineno" valign="top"></td></tr>
    243244      <tr><td class="lineno" valign="top"></td><td class="lblock">   rule expanded.</td><td> </td><td class="rblock"><span class="insert">   documents.  Appendix C</span> shows the collected ABNF with the list rule</td><td class="lineno" valign="top"></td></tr>
     
    280281      <tr><td class="lineno" valign="top"></td><td class="left">      parameters.</td><td> </td><td class="right">      parameters.</td><td class="lineno" valign="top"></td></tr>
    281282      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    282       <tr><td><a name="diff0019" /></td></tr>
     283      <tr><td><a name="diff0020" /></td></tr>
    283284      <tr><td class="lineno" valign="top"></td><td class="lblock">      Note: Many <span class="delete">browser</span>s fail to parse challenges containing unknown</td><td> </td><td class="rblock">      Note: Many <span class="insert">client</span>s fail to parse challenges containing unknown</td><td class="lineno" valign="top"></td></tr>
    284285      <tr><td class="lineno" valign="top"></td><td class="left">      schemes.  A workaround for this problem is to list well-supported</td><td> </td><td class="right">      schemes.  A workaround for this problem is to list well-supported</td><td class="lineno" valign="top"></td></tr>
     
    287288      <tr><td class="lineno" valign="top"></td><td class="left">   A user agent that wishes to authenticate itself with an origin server</td><td> </td><td class="right">   A user agent that wishes to authenticate itself with an origin server</td><td class="lineno" valign="top"></td></tr>
    288289      <tr><td class="lineno" valign="top"></td><td class="left">   -- usually, but not necessarily, after receiving a 401 (Unauthorized)</td><td> </td><td class="right">   -- usually, but not necessarily, after receiving a 401 (Unauthorized)</td><td class="lineno" valign="top"></td></tr>
    289       <tr><td><a name="diff0020" /></td></tr>
     290      <tr><td><a name="diff0021" /></td></tr>
    290291      <tr><td class="lineno" valign="top"></td><td class="lblock">   -- <span class="delete">MAY</span> do so by including an Authorization header field with the</td><td> </td><td class="rblock">   -- <span class="insert">can</span> do so by including an Authorization header field with the</td><td class="lineno" valign="top"></td></tr>
    291292      <tr><td class="lineno" valign="top"></td><td class="left">   request.</td><td> </td><td class="right">   request.</td><td class="lineno" valign="top"></td></tr>
     
    293294      <tr><td class="lineno" valign="top"></td><td class="left">   A client that wishes to authenticate itself with a proxy -- usually,</td><td> </td><td class="right">   A client that wishes to authenticate itself with a proxy -- usually,</td><td class="lineno" valign="top"></td></tr>
    294295      <tr><td class="lineno" valign="top"></td><td class="left">   but not necessarily, after receiving a 407 (Proxy Authentication</td><td> </td><td class="right">   but not necessarily, after receiving a 407 (Proxy Authentication</td><td class="lineno" valign="top"></td></tr>
    295       <tr><td><a name="diff0021" /></td></tr>
     296      <tr><td><a name="diff0022" /></td></tr>
    296297      <tr><td class="lineno" valign="top"></td><td class="lblock">   Required) -- <span class="delete">MAY</span> do so by including a Proxy-Authorization header</td><td> </td><td class="rblock">   Required) -- <span class="insert">can</span> do so by including a Proxy-Authorization header</td><td class="lineno" valign="top"></td></tr>
    297298      <tr><td class="lineno" valign="top"></td><td class="left">   field with the request.</td><td> </td><td class="right">   field with the request.</td><td class="lineno" valign="top"></td></tr>
    298299      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    299300      <tr><td class="lineno" valign="top"></td><td class="left">   Both the Authorization field value and the Proxy-Authorization field</td><td> </td><td class="right">   Both the Authorization field value and the Proxy-Authorization field</td><td class="lineno" valign="top"></td></tr>
    300       <tr><td><a name="diff0022" /></td></tr>
     301      <tr><td><a name="diff0023" /></td></tr>
    301302      <tr><td class="lineno" valign="top"></td><td class="lblock">   value <span class="delete">consist of credentials containing</span> the <span class="delete">authentication</span></td><td> </td><td class="rblock">   value <span class="insert">contain</span> the <span class="insert">client's credentials</span> for the realm of the resource</td><td class="lineno" valign="top"></td></tr>
    302303      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   information of the client</span> for the realm of the resource being</td><td> </td><td class="rblock">   being <span class="insert">requested, based upon a challenge received from the server</span></td><td class="lineno" valign="top"></td></tr>
     
    308309      <tr><td class="lineno" valign="top"></td><td class="left">     credentials = auth-scheme [ 1*SP ( b64token / #auth-param ) ]</td><td> </td><td class="right">     credentials = auth-scheme [ 1*SP ( b64token / #auth-param ) ]</td><td class="lineno" valign="top"></td></tr>
    309310      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    310       <tr><td><a name="diff0023" /></td></tr>
     311      <tr><td><a name="diff0024" /></td></tr>
    311312      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">If</span> the origin server <span class="delete">does not wish to accept the credentials sent</span></td><td> </td><td class="rblock">   <span class="insert">Upon a request for a protected resource that omits credentials,</span></td><td class="lineno" valign="top"></td></tr>
    312313      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   with a request, it</span> SHOULD return a 401 (Unauthorized) response.  <span class="delete">The</span></td><td> </td><td class="rblock"><span class="insert">   contains invalid credentials (e.g., a bad password) or partial</span></td><td class="lineno" valign="top"></td></tr>
     
    317318      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   the requested resource.</td><td class="lineno" valign="top"></td></tr>
    318319      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    319       <tr><td><a name="diff0024" /></td></tr>
     320      <tr><td><a name="diff0025" /></td></tr>
    320321      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">If</span> a <span class="delete">proxy does not accept the</span> credentials <span class="delete">sent with</span> a <span class="delete">request, it</span></td><td> </td><td class="rblock">   <span class="insert">Likewise, upon</span> a <span class="insert">request that requires authentication by proxies that</span></td><td class="lineno" valign="top"></td></tr>
    321322      <tr><td class="lineno" valign="top"></td><td class="lblock">   SHOULD return a 407 (Proxy Authentication <span class="delete">Required).  The response</span></td><td> </td><td class="rblock"><span class="insert">   omit</span> credentials <span class="insert">or contain invalid or partial credentials,</span> a <span class="insert">proxy</span></td><td class="lineno" valign="top"></td></tr>
     
    335336      <tr><td class="lineno" valign="top"></td><td class="left">   mechanisms are not defined by this specification.</td><td> </td><td class="right">   mechanisms are not defined by this specification.</td><td class="lineno" valign="top"></td></tr>
    336337      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    337       <tr><td><a name="diff0025" /></td></tr>
     338      <tr><td><a name="diff0026" /></td></tr>
    338339      <tr><td class="lineno" valign="top"></td><td class="lblock">   Proxies MUST forward the WWW-Authenticate and Authorization <span class="delete">headers</span></td><td> </td><td class="rblock">   Proxies MUST forward the WWW-Authenticate and Authorization <span class="insert">header</span></td><td class="lineno" valign="top"></td></tr>
    339340      <tr><td class="lineno" valign="top"></td><td class="lblock">   unmodified and follow the rules found in Section 4.1.</td><td> </td><td class="rblock"><span class="insert">   fields</span> unmodified and follow the rules found in Section 4.1.</td><td class="lineno" valign="top"></td></tr>
     
    360361      <tr><td class="lineno" valign="top"></td><td class="left">      and inherently flawed unless steps are taken to ensure that the</td><td> </td><td class="right">      and inherently flawed unless steps are taken to ensure that the</td><td class="lineno" valign="top"></td></tr>
    361362      <tr><td class="lineno" valign="top"></td><td class="left">      connection cannot be used by any party other than the</td><td> </td><td class="right">      connection cannot be used by any party other than the</td><td class="lineno" valign="top"></td></tr>
    362       <tr><td><a name="diff0026" /></td></tr>
     363      <tr><td><a name="diff0027" /></td></tr>
    363364      <tr><td class="lineno" valign="top"></td><td class="lblock">      authenticated user (see Section 2.<span class="delete">3</span> of [Part1]).</td><td> </td><td class="rblock">      authenticated user (see Section 2.<span class="insert">4</span> of [Part1]).</td><td class="lineno" valign="top"></td></tr>
    364365      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    382383      <tr><td class="lineno" valign="top"></td><td class="left">      authentication schemes.</td><td> </td><td class="right">      authentication schemes.</td><td class="lineno" valign="top"></td></tr>
    383384      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    384       <tr><td><a name="diff0027" /></td></tr>
     385      <tr><td><a name="diff0028" /></td></tr>
    385386      <tr><td class="lineno" valign="top"></td><td class="lblock">      Note: <span class="delete">t</span>he fact that the value syntax for the "realm" parameter is</td><td> </td><td class="rblock">      Note: <span class="insert">T</span>he fact that the value syntax for the "realm" parameter is</td><td class="lineno" valign="top"></td></tr>
    386387      <tr><td class="lineno" valign="top"></td><td class="left">      restricted to quoted-string was a bad design choice not to be</td><td> </td><td class="right">      restricted to quoted-string was a bad design choice not to be</td><td class="lineno" valign="top"></td></tr>
     
    406407      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    407408      <tr><td class="lineno" valign="top"></td><td class="left">      Therefore, new authentication schemes which choose not to carry</td><td> </td><td class="right">      Therefore, new authentication schemes which choose not to carry</td><td class="lineno" valign="top"></td></tr>
    408       <tr><td><a name="diff0028" /></td></tr>
     409      <tr><td><a name="diff0029" /></td></tr>
    409410      <tr><td class="lineno" valign="top"></td><td class="lblock">      credentials in the Authorization header (e.g., using a newly</td><td> </td><td class="rblock">      credentials in the Authorization header <span class="insert">field</span> (e.g., using a newly</td><td class="lineno" valign="top"></td></tr>
    410411      <tr><td class="lineno" valign="top"></td><td class="lblock">      defined <span class="delete">header)</span> will need to explicitly disallow caching, by</td><td> </td><td class="rblock">      defined <span class="insert">header field)</span> will need to explicitly disallow caching, by</td><td class="lineno" valign="top"></td></tr>
     
    431432      <tr><td class="lineno" valign="top"></td><td class="left">4.2.  Proxy-Authenticate</td><td> </td><td class="right">4.2.  Proxy-Authenticate</td><td class="lineno" valign="top"></td></tr>
    432433      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    433       <tr><td><a name="diff0029" /></td></tr>
     434      <tr><td><a name="diff0030" /></td></tr>
    434435      <tr><td class="lineno" valign="top"></td><td class="lblock">   The "Proxy-Authenticate" header field consists of <span class="delete">a</span> challenge that</td><td> </td><td class="rblock">   The "Proxy-Authenticate" header field consists of <span class="insert">at least one</span></td><td class="lineno" valign="top"></td></tr>
    435436      <tr><td class="lineno" valign="top"></td><td class="lblock">   indicates the authentication <span class="delete">scheme</span> and parameters applicable to the</td><td> </td><td class="rblock">   challenge that indicates the authentication <span class="insert">scheme(s)</span> and parameters</td><td class="lineno" valign="top"></td></tr>
     
    441442      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    442443      <tr><td class="lineno" valign="top"></td><td class="left">   Unlike WWW-Authenticate, the Proxy-Authenticate header field applies</td><td> </td><td class="right">   Unlike WWW-Authenticate, the Proxy-Authenticate header field applies</td><td class="lineno" valign="top"></td></tr>
    443       <tr><td><a name="diff0030" /></td></tr>
     444      <tr><td><a name="diff0031" /></td></tr>
    444445      <tr><td class="lineno" valign="top"></td><td class="lblock">   only to the current <span class="delete">connection</span> and SHOULD NOT <span class="delete">be passed on</span> to</td><td> </td><td class="rblock">   only to the current <span class="insert">connection,</span> and <span class="insert">intermediaries</span> SHOULD NOT <span class="insert">forward</span></td><td class="lineno" valign="top"></td></tr>
    445446      <tr><td class="lineno" valign="top"></td><td class="lblock">   downstream clients.  However, an intermediate proxy might need to</td><td> </td><td class="rblock"><span class="insert">   it</span> to downstream clients.  However, an intermediate proxy might need</td><td class="lineno" valign="top"></td></tr>
     
    467468      <tr><td class="lineno" valign="top"></td><td class="left">5.  IANA Considerations</td><td> </td><td class="right">5.  IANA Considerations</td><td class="lineno" valign="top"></td></tr>
    468469      <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="diff0031" /></td></tr>
     470      <tr><td><a name="diff0032" /></td></tr>
    470471      <tr><td class="lineno" valign="top"></td><td class="lblock">5.1.  Authenticaton Scheme Registry</td><td> </td><td class="rblock">5.1.  Authenticat<span class="insert">i</span>on Scheme Registry</td><td class="lineno" valign="top"></td></tr>
    471472      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    491492      <tr><td class="lineno" valign="top"></td><td class="left">   cached credentials under user control.</td><td> </td><td class="right">   cached credentials under user control.</td><td class="lineno" valign="top"></td></tr>
    492493      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    493       <tr><td><a name="diff0032" /></td></tr>
     494      <tr><td><a name="diff0033" /></td></tr>
    494495      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">6.2.  Protection Spaces</span></td><td class="lineno" valign="top"></td></tr>
    495496      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    531532      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    532533      <tr><td class="lineno" valign="top"></td><td class="left">8.  References</td><td> </td><td class="right">8.  References</td><td class="lineno" valign="top"></td></tr>
    533       <tr><td><a name="diff0033" /></td></tr>
     534      <tr><td><a name="diff0034" /></td></tr>
    534535      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">                                                                         </span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    535536      <tr><td class="lineno" valign="top"></td><td class="left">8.1.  Normative References</td><td> </td><td class="right">8.1.  Normative References</td><td class="lineno" valign="top"></td></tr>
    536537      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    537538      <tr><td class="lineno" valign="top"></td><td class="left">   [Part1]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td> </td><td class="right">   [Part1]    Fielding, R., Ed., Lafon, Y., Ed., and J. Reschke, Ed.,</td><td class="lineno" valign="top"></td></tr>
    538       <tr><td><a name="diff0034" /></td></tr>
     539      <tr><td><a name="diff0035" /></td></tr>
    539540      <tr><td class="lineno" valign="top"></td><td class="lblock">              "HTTP/1.1, part 1: <span class="delete">URIs, Connections, and</span> Message</td><td> </td><td class="rblock">              "HTTP/1.1, part 1: Message <span class="insert">Routing and Syntax"",</span></td><td class="lineno" valign="top"></td></tr>
    540541      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">Parsing", draft-ietf-httpbis-p1-messaging-19</span> (work in</td><td> </td><td class="rblock"><span class="insert">              draft-ietf-httpbis-p1-messaging-20 (work in progress),</span></td><td class="lineno" valign="top"></td></tr>
     
    548549      <tr><td class="lineno" valign="top"></td><td class="left">   [Part6]    Fielding, R., Ed., Lafon, Y., Ed., Nottingham, M., Ed.,</td><td> </td><td class="right">   [Part6]    Fielding, R., Ed., Lafon, Y., Ed., Nottingham, M., Ed.,</td><td class="lineno" valign="top"></td></tr>
    549550      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 6: Caching",</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 6: Caching",</td><td class="lineno" valign="top"></td></tr>
    550       <tr><td><a name="diff0035" /></td></tr>
     551      <tr><td><a name="diff0036" /></td></tr>
    551552      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p6-cache-19</span> (work in progress),</td><td> </td><td class="rblock">              <span class="insert">draft-ietf-httpbis-p6-cache-20</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
    552553      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">March</span> 2012.</td><td> </td><td class="rblock">              <span class="insert">July</span> 2012.</td><td class="lineno" valign="top"></td></tr>
     
    573574      <tr><td class="lineno" valign="top"></td><td class="left">   (Section 2)</td><td> </td><td class="right">   (Section 2)</td><td class="lineno" valign="top"></td></tr>
    574575      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    575       <tr><td><a name="diff0036" /></td></tr>
     576      <tr><td><a name="diff0037" /></td></tr>
    576577      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   <span class="insert">Introduce Authentication Scheme Registry.  (Section 2.3)</span></td><td class="lineno" valign="top"></td></tr>
    577578      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
     
    579580      <tr><td class="lineno" valign="top"></td><td class="left">   value.  (Section 4)</td><td> </td><td class="right">   value.  (Section 4)</td><td class="lineno" valign="top"></td></tr>
    580581      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    581       <tr><td><a name="diff0037" /></td></tr>
     582      <tr><td><a name="diff0038" /></td></tr>
    582583      <tr><td class="lineno" valign="top"></td><td class="lblock">Appendix B.  Collected ABNF</td><td> </td><td class="rblock">Appendix B.  <span class="insert">Imported ABNF</span></td><td class="lineno" valign="top"></td></tr>
    583584      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    619620      <tr><td class="lineno" valign="top"></td><td class="left">   token = &lt;token, defined in [Part1], Section 3.2.4&gt;</td><td> </td><td class="right">   token = &lt;token, defined in [Part1], Section 3.2.4&gt;</td><td class="lineno" valign="top"></td></tr>
    620621      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    621       <tr><td><a name="diff0038" /></td></tr>
     622      <tr><td><a name="diff0039" /></td></tr>
    622623      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">ABNF diagnostics:</span></td><td> </td><td class="rblock">Appendix <span class="insert">D.</span>  Change Log (to be removed by RFC Editor before publication)</td><td class="lineno" valign="top"></td></tr>
    623624      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"></span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    775776      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      HTTP's error-handling philosophy"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    776777      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    777       <tr><td><a name="diff0039" /></td></tr>
     778      <tr><td><a name="diff0040" /></td></tr>
    778779      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/320&gt;: "add advice on</span></td><td> </td><td class="rblock">   <span class="insert">Changes up to the first Working Group Last Call draft are summarized</span></td><td class="lineno" valign="top"></td></tr>
    779780      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      defining auth scheme parameters"</span></td><td> </td><td class="rblock"><span class="insert">   in &lt;http://trac.tools.ietf.org/html/</span></td><td class="lineno" valign="top"></td></tr>
    780781      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   draft-ietf-httpbis-p7-auth-19#appendix-C&gt;.</span></td><td class="lineno" valign="top"></td></tr>
    781782      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    782       <tr><td><a name="diff0040" /></td></tr>
     783      <tr><td><a name="diff0041" /></td></tr>
    783784      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">C.19.  Since draft-ietf-httpbis-p7-auth-17</span></td><td> </td><td class="rblock"><span class="insert">D.1.  Since draft-ietf-httpbis-p7-auth-19</span></td><td class="lineno" valign="top"></td></tr>
    784785      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    785786      <tr><td class="lineno" valign="top"></td><td class="left">   Closed issues:</td><td> </td><td class="right">   Closed issues:</td><td class="lineno" valign="top"></td></tr>
    786787      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    787       <tr><td><a name="diff0041" /></td></tr>
     788      <tr><td><a name="diff0042" /></td></tr>
    788789      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/314&gt;: "allow</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/348&gt;: "Realms and</span></td><td class="lineno" valign="top"></td></tr>
    789790      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      unquoted realm parameters"</span></td><td> </td><td class="rblock"><span class="insert">      scope"</span></td><td class="lineno" valign="top"></td></tr>
     
    792793      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      auth-params"</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    793794      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    794       <tr><td><a name="diff0042" /></td></tr>
     795      <tr><td><a name="diff0043" /></td></tr>
    795796      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">C.20.  Since draft-ietf-httpbis-p7-auth-18</span></td><td> </td><td class="rblock"><span class="insert">   o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/349&gt;: "Strength"</span></td><td class="lineno" valign="top"></td></tr>
    796797      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    797       <tr><td><a name="diff0043" /></td></tr>
     798      <tr><td><a name="diff0044" /></td></tr>
    798799      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Closed issues:</span></td><td> </td><td class="rblock">   <span class="insert">o  &lt;http://tools.ietf.org/wg/httpbis/trac/ticket/357&gt;:</span></td><td class="lineno" valign="top"></td></tr>
    799800      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      "Authentication exchanges"</span></td><td class="lineno" valign="top"></td></tr>
    800801      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    801       <tr><td><a name="diff0044" /></td></tr>
     802      <tr><td><a name="diff0045" /></td></tr>
    802803      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/334&gt;: "recipient</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/361&gt;: "ABNF</span></td><td class="lineno" valign="top"></td></tr>
    803804      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      behavior</span> for <span class="delete">new auth parameters"</span></td><td> </td><td class="rblock"><span class="insert">      requirements</span> for <span class="insert">recipients"</span></td><td class="lineno" valign="top"></td></tr>
    804805      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    805       <tr><td><a name="diff0045" /></td></tr>
     806      <tr><td><a name="diff0046" /></td></tr>
    806807      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/342&gt;: "WWW-</span></td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/368&gt;: "note</span></td><td class="lineno" valign="top"></td></tr>
    807808      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      Authenticate ABNF slightly ambiguous"</span></td><td> </td><td class="rblock"><span class="insert">      introduction of new IANA registries as normative changes"</span></td><td class="lineno" valign="top"></td></tr>
     
    811812      <tr><td class="lineno" valign="top"></td><td class="left">   4</td><td> </td><td class="right">   4</td><td class="lineno" valign="top"></td></tr>
    812813      <tr><td class="lineno" valign="top"></td><td class="left">      401 Unauthorized (status code)  9</td><td> </td><td class="right">      401 Unauthorized (status code)  9</td><td class="lineno" valign="top"></td></tr>
    813       <tr><td><a name="diff0046" /></td></tr>
     814      <tr><td><a name="diff0047" /></td></tr>
    814815      <tr><td class="lineno" valign="top"></td><td class="lblock">      407 Proxy Authentication Required (status code)  <span class="delete">9</span></td><td> </td><td class="rblock">      407 Proxy Authentication Required (status code)  <span class="insert">10</span></td><td class="lineno" valign="top"></td></tr>
    815816      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    823824      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    824825      <tr><td class="lineno" valign="top"></td><td class="left">   C</td><td> </td><td class="right">   C</td><td class="lineno" valign="top"></td></tr>
    825       <tr><td><a name="diff0047" /></td></tr>
     826      <tr><td><a name="diff0048" /></td></tr>
    826827      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      Canonical Root URI  7</span></td><td class="lineno" valign="top"></td></tr>
    827828      <tr><td class="lineno" valign="top"></td><td class="left">      challenge  6</td><td> </td><td class="right">      challenge  6</td><td class="lineno" valign="top"></td></tr>
     
    845846      <tr><td class="lineno" valign="top"></td><td class="left">         Proxy-Authenticate  11</td><td> </td><td class="right">         Proxy-Authenticate  11</td><td class="lineno" valign="top"></td></tr>
    846847      <tr><td class="lineno" valign="top"></td><td class="left">         Proxy-Authorization  11</td><td> </td><td class="right">         Proxy-Authorization  11</td><td class="lineno" valign="top"></td></tr>
    847       <tr><td><a name="diff0048" /></td></tr>
     848      <tr><td><a name="diff0049" /></td></tr>
    848849      <tr><td class="lineno" valign="top"></td><td class="lblock">         WWW-Authenticate  1<span class="delete">1</span></td><td> </td><td class="rblock">         WWW-Authenticate  1<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    849850      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    859860      <tr><td class="lineno" valign="top"></td><td class="left">      Status Codes</td><td> </td><td class="right">      Status Codes</td><td class="lineno" valign="top"></td></tr>
    860861      <tr><td class="lineno" valign="top"></td><td class="left">         401 Unauthorized  9</td><td> </td><td class="right">         401 Unauthorized  9</td><td class="lineno" valign="top"></td></tr>
    861       <tr><td><a name="diff0049" /></td></tr>
     862      <tr><td><a name="diff0050" /></td></tr>
    862863      <tr><td class="lineno" valign="top"></td><td class="lblock">         407 Proxy Authentication Required  <span class="delete">9</span></td><td> </td><td class="rblock">         407 Proxy Authentication Required  <span class="insert">10</span></td><td class="lineno" valign="top"></td></tr>
    863864      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    864865      <tr><td class="lineno" valign="top"></td><td class="left">   W</td><td> </td><td class="right">   W</td><td class="lineno" valign="top"></td></tr>
    865       <tr><td><a name="diff0050" /></td></tr>
     866      <tr><td><a name="diff0051" /></td></tr>
    866867      <tr><td class="lineno" valign="top"></td><td class="lblock">      WWW-Authenticate header field  1<span class="delete">1</span></td><td> </td><td class="rblock">      WWW-Authenticate header field  1<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    867868      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    887888      <tr><td class="lineno" valign="top"></td><td class="left">   EMail: ylafon@w3.org</td><td> </td><td class="right">   EMail: ylafon@w3.org</td><td class="lineno" valign="top"></td></tr>
    888889      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://www.raubacapeu.net/people/yves/</td><td> </td><td class="right">   URI:   http://www.raubacapeu.net/people/yves/</td><td class="lineno" valign="top"></td></tr>
    889       <tr><td><a name="diff0051" /></td></tr>
     890      <tr><td><a name="diff0052" /></td></tr>
    890891      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">                                                                         </span></td><td class="lineno" valign="top"></td></tr>
    891892      <tr><td class="lineno" valign="top"></td><td class="left">   Julian F. Reschke (editor)</td><td> </td><td class="right">   Julian F. Reschke (editor)</td><td class="lineno" valign="top"></td></tr>
     
    895896      <tr><td class="lineno" valign="top"></td><td class="left">   Germany</td><td> </td><td class="right">   Germany</td><td class="lineno" valign="top"></td></tr>
    896897      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    897       <tr><td><a name="diff0052" /></td></tr>
     898      <tr><td><a name="diff0053" /></td></tr>
    898899      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Phone: +49 251 2807760</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    899900      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Fax:   +49 251 2807761</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    902903
    903904     <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
    904      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 52 change blocks.&nbsp;</a></th></tr>
    905      <tr class="stats"><td></td><th><i>294 lines changed or deleted</i></th><th><i> </i></th><th><i>165 lines changed or added</i></th><td></td></tr>
     905     <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 53 change blocks.&nbsp;</a></th></tr>
     906     <tr class="stats"><td></td><th><i>300 lines changed or deleted</i></th><th><i> </i></th><th><i>166 lines changed or added</i></th><td></td></tr>
    906907     <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>
    907908   </table>
Note: See TracChangeset for help on using the changeset viewer.