Ticket #187: 187.diff

File 187.diff, 4.8 KB (added by julian.reschke@…, 12 years ago)

Proposed patch for part 6.

  • p6-cache.xml

     
    1212  <!ENTITY SHOULD "<bcp14 xmlns='http://purl.org/net/xml2rfc/ext'>SHOULD</bcp14>">
    1313  <!ENTITY SHOULD-NOT "<bcp14 xmlns='http://purl.org/net/xml2rfc/ext'>SHOULD NOT</bcp14>">
    1414  <!ENTITY ID-VERSION "latest">
    15   <!ENTITY ID-MONTH "July">
     15  <!ENTITY ID-MONTH "August">
    1616  <!ENTITY ID-YEAR "2009">
    1717  <!ENTITY notation                    "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1818  <!ENTITY basic-rules                 "<xref target='Part1' x:rel='#basic.rules' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     
    14251425<t>
    14261426  When this occurs, the user agent &SHOULD; inform the user of as many of them as
    14271427  possible, in the order that they appear in the response. If it is not possible to inform
    1428   the user of all of the warnings, the user agent &SHOULD; follow these heuristics:
     1428  the user of all of the warnings, the user agent &SHOULD; follow the rule below:
    14291429  <list style="symbols">
    14301430    <t>Warnings that appear early in the response take priority over those appearing later
    14311431      in the response.</t>
    1432     <t>Warnings in the user's preferred character set take priority over warnings in other
    1433       character sets but with identical warn-codes and warn-agents.</t>
    14341432  </list>
    14351433</t>
    14361434<t>
     
    14521450  </list>
    14531451</t>
    14541452<t>
    1455   The warn-text &SHOULD; be in a natural language and character set that is most likely
    1456   to be intelligible to the human user receiving the response. This decision can be based on
    1457   any available knowledge, such as the location of the cache or user, the Accept-Language
    1458   field in a request, the Content-Language field in a response, etc. The default language is
    1459   English and the default character set is ISO-8859-1 (<xref target="ISO-8859-1" />).
     1453  The warn-text &SHOULD; be in a natural language that is most likely to be
     1454  intelligible to the human user receiving the response. This decision can be
     1455  based on any available knowledge, such as the location of the cache or user,
     1456  the Accept-Language field in a request, the Content-Language field in a
     1457  response, etc. The default language is English.
    14601458</t>
    14611459<t>
    1462   If a character set other than ISO-8859-1 is used, it &MUST; be encoded in the
    1463   warn-text using the method described in <xref target="RFC2047" />.
    1464 </t>
    1465 <t>
    14661460  If an implementation sends a message with one or more Warning headers to a receiver whose
    14671461  version is HTTP/1.0 or lower, then the sender &MUST; include in each warning-value a
    14681462  warn-date that matches the Date header in the message.
     
    16611655<back>
    16621656<references title="Normative References">
    16631657
    1664   <reference anchor="ISO-8859-1">
    1665     <front>
    1666       <title> Information technology -- 8-bit single-byte coded graphic character sets -- Part
    1667         1: Latin alphabet No. 1 </title>
    1668       <author>
    1669         <organization>International Organization for Standardization</organization>
    1670       </author>
    1671       <date year="1998" />
    1672     </front>
    1673     <seriesInfo name="ISO/IEC" value="8859-1:1998" />
    1674   </reference>
    1675 
    16761658  <reference anchor="Part1">
    16771659    <front>
    16781660      <title abbrev="HTTP/1.1">HTTP/1.1, part 1: URIs, Connections, and Message Parsing</title>
     
    19431925    <x:source basename="p7-auth" href="p7-auth.xml" />
    19441926  </reference>
    19451927
    1946   <reference anchor="RFC2047">
    1947     <front>
    1948       <title abbrev="Message Header Extensions">MIME (Multipurpose Internet Mail Extensions)
    1949         Part Three: Message Header Extensions for Non-ASCII Text</title>
    1950       <author fullname="Keith Moore" initials="K." surname="Moore">
    1951         <organization>University of Tennessee</organization>
    1952         <address><email>moore@cs.utk.edu</email></address>
    1953       </author>
    1954       <date month="November" year="1996" />
    1955     </front>
    1956     <seriesInfo name="RFC" value="2047" />
    1957   </reference>
    1958 
    19591928  <reference anchor="RFC2119">
    19601929    <front>
    19611930      <title>Key words for use in RFCs to Indicate Requirement Levels</title>
     
    21192088  Clarify denial of service attack avoidance requirement.
    21202089  (<xref target="invalidation.after.updates.or.deletions" />)
    21212090</t>
     2091<t>
     2092  Do not mention RFC 2047 encoding in Warning headers anymore, as it never
     2093  was implemented.
     2094  (<xref target="header.warning" />)
     2095</t>
    21222096</section>
    21232097
    21242098    </section>
     
    23452319
    23462320<section anchor="changes.since.07" title="Since draft-ietf-httpbis-p6-cache-07">
    23472321<t>
    2348   None.
     2322  Closed issues:
     2323  <list style="symbols">
     2324    <t>
     2325      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/187"/>:
     2326      "RFC2047 and warn-text"
     2327    </t>
     2328  </list>
    23492329</t>
    23502330</section>
    23512331