Ignore:
Timestamp:
Mar 30, 2012, 7:38:53 AM (8 years ago)
Author:
julian.reschke@…
Message:

Step 2 of p2/p3-merge (see #351)

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

Legend:

Unmodified
Added
Removed

  • draft-ietf-httpbis/latest/Makefile

    r1487 r1640  
    3333          p2-semantics.iana-methods     \
    3434          p2-semantics.iana-status-codes \
    35           p3-payload.iana-headers \
    3635          p4-conditional.iana-headers \
    3736          p4-conditional.iana-status-codes \

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

    r1639 r1640  
    44   <head profile="http://www.w3.org/2006/03/hcard http://dublincore.org/documents/2008/08/04/dc-html/">
    55      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    6       <title>HTTP/1.1, part 2: Message Semantics</title><script>
     6      <title>HTTP/1.1, part 2: Message Semantics, Payload and Content Negotiation</title><script>
    77var buttonsAdded = false;
    88
    … …  
    506506      <meta name="dct.issued" scheme="ISO8601" content="2012-03-30">
    507507      <meta name="dct.replaces" content="urn:ietf:rfc:2616">
    508       <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 2 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 2 defines the semantics of HTTP messages as expressed by request methods, request header fields, response status codes, and response header fields.">
    509       <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 2 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 2 defines the semantics of HTTP messages as expressed by request methods, request header fields, response status codes, and response header fields.">
     508      <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 2 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 2 defines the semantics of HTTP messages as expressed by request methods, request header fields, response status codes, and response header fields. Furthermore, it defines HTTP message content, metadata, and content negotiation. #351">
     509      <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 2 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 2 defines the semantics of HTTP messages as expressed by request methods, request header fields, response status codes, and response header fields. Furthermore, it defines HTTP message content, metadata, and content negotiation. #351">
    510510   </head>
    511511   <body onload="init();">
    … …  
    544544         </tbody>
    545545      </table>
    546       <p class="title">HTTP/1.1, part 2: Message Semantics<br><span class="filename">draft-ietf-httpbis-p2-semantics-latest</span></p>
     546      <p class="title">HTTP/1.1, part 2: Message Semantics, Payload and Content Negotiation<br><span class="filename">draft-ietf-httpbis-p2-semantics-latest</span></p>
    547547      <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
    548548      <p>The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information
    … …  
    551551      </p> 
    552552      <p>Part 2 defines the semantics of HTTP messages as expressed by request methods, request header fields, response status codes,
    553          and response header fields.
     553         and response header fields. Furthermore, it defines HTTP message content, metadata, and content negotiation. <span class="comment" id="rfc.comment.1">[<a href="#rfc.comment.1" class="smpl">rfc.comment.1</a>: #351]</span>
    554554      </p>
    555555      <h1 id="rfc.note.1"><a href="#rfc.note.1">Editorial Note (To be removed by RFC Editor)</a></h1>
    … …  
    761761         response messages that might be expected as a result of applying that method to the target resource.
    762762      </p>
    763       <p id="rfc.section.1.p.2">This document is currently disorganized in order to minimize the changes between drafts and enable reviewers to see the smaller
     763      <p id="rfc.section.1.p.2">Furthermore, it defines HTTP/1.1 message payloads (a.k.a., content), the associated metadata header fields that define how
     764         the payload is intended to be interpreted by a recipient, the request header fields that might influence content selection,
     765         and the various selection algorithms that are collectively referred to as HTTP content negotiation. <span class="comment" id="rfc.comment.2">[<a href="#rfc.comment.2" class="smpl">rfc.comment.2</a>: #351]</span>
     766      </p>
     767      <p id="rfc.section.1.p.3">This document is currently disorganized in order to minimize the changes between drafts and enable reviewers to see the smaller
    764768         errata changes. A future draft will reorganize the sections to better reflect the content. In particular, the sections will
    765769         be ordered according to the typical processing of an HTTP request message (after message parsing): resource mapping, methods,

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

    r1639 r1640  
    136136<front>
    137137
    138   <title abbrev="HTTP/1.1, Part 2">HTTP/1.1, part 2: Message Semantics</title>
     138  <title abbrev="HTTP/1.1, Part 2">HTTP/1.1, part 2: Message Semantics, Payload and Content Negotiation</title>
    139139
    140140  <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
    … …  
    198198   Part 2 defines the semantics of HTTP messages as expressed by request
    199199   methods, request header fields, response status codes, and response header
    200    fields.
     200   fields. Furthermore, it defines HTTP message content, metadata, and content
     201   negotiation.
     202   <cref>#351</cref>
    201203</t>
    202204</abstract>
    … …  
    230232   by each request method, and the various response messages that might be
    231233   expected as a result of applying that method to the target resource.
     234</t>
     235<t>
     236   Furthermore, it defines HTTP/1.1 message payloads (a.k.a., content), the
     237   associated metadata header fields that define how the payload is intended
     238   to be interpreted by a recipient, the request header fields that
     239   might influence content selection, and the various selection algorithms
     240   that are collectively referred to as HTTP content negotiation.
     241   <cref>#351</cref>
    232242</t>
    233243<t>

  • draft-ietf-httpbis/latest/p3-payload.html

    r1639 r1640  
    505505      <meta name="dct.issued" scheme="ISO8601" content="2012-03-30">
    506506      <meta name="dct.replaces" content="urn:ietf:rfc:2616">
    507       <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 3 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 3 defines HTTP message content, metadata, and content negotiation.">
    508       <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 3 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 3 defines HTTP message content, metadata, and content negotiation.">
     507      <meta name="dct.abstract" content="This part is now obsolete. Please see HTTPbis, Part 2.">
     508      <meta name="description" content="This part is now obsolete. Please see HTTPbis, Part 2.">
    509509   </head>
    510510   <body onload="init();">
    … …  
    544544      <p class="title">HTTP/1.1, part 3: Message Payload and Content Negotiation<br><span class="filename">draft-ietf-httpbis-p3-payload-latest</span></p>
    545545      <h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
    546       <p>The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information
    547          systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 3 of the
    548          seven-part specification that defines the protocol referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    549       </p> 
    550       <p>Part 3 defines HTTP message content, metadata, and content negotiation.</p>
    551       <h1 id="rfc.note.1"><a href="#rfc.note.1">Editorial Note (To be removed by RFC Editor)</a></h1>
    552       <p>Discussion of this draft should take place on the HTTPBIS working group mailing list (ietf-http-wg@w3.org), which is archived
    553          at &lt;<a href="http://lists.w3.org/Archives/Public/ietf-http-wg/">http://lists.w3.org/Archives/Public/ietf-http-wg/</a>&gt;.
    554       </p> 
    555       <p>The current issues list is at &lt;<a href="http://tools.ietf.org/wg/httpbis/trac/report/3">http://tools.ietf.org/wg/httpbis/trac/report/3</a>&gt; and related documents (including fancy diffs) can be found at &lt;<a href="http://tools.ietf.org/wg/httpbis/">http://tools.ietf.org/wg/httpbis/</a>&gt;.
    556       </p> 
    557       <p>The changes in this draft are summarized in <a href="#changes.since.19" title="Since draft-ietf-httpbis-p3-payload-19">Appendix&nbsp;D.21</a>.
    558       </p>
     546      <p>This part is now obsolete. Please see HTTPbis, Part 2.</p>
    559547      <h1><a id="rfc.status" href="#rfc.status">Status of This Memo</a></h1>
    560548      <p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
    … …  
    687675      </ul>
    688676      <h1 id="rfc.section.1" class="np"><a href="#rfc.section.1">1.</a>&nbsp;<a id="introduction" href="#introduction">Introduction</a></h1>
    689       <p id="rfc.section.1.p.1">This document defines HTTP/1.1 message payloads (a.k.a., content), the associated metadata header fields that define how the
    690          payload is intended to be interpreted by a recipient, the request header fields that might influence content selection, and
    691          the various selection algorithms that are collectively referred to as HTTP content negotiation.
    692       </p>
    693       <p id="rfc.section.1.p.2">This document is currently disorganized in order to minimize the changes between drafts and enable reviewers to see the smaller
    694          errata changes. A future draft will reorganize the sections to better reflect the content. In particular, the sections on
    695          entities will be renamed payload and moved to the first half of the document, while the sections on content negotiation and
    696          associated request header fields will be moved to the second half. The current mess reflects how widely dispersed these topics
    697          and associated requirements had become in <a href="#RFC2616" id="rfc.xref.RFC2616.1"><cite title="Hypertext Transfer Protocol -- HTTP/1.1">[RFC2616]</cite></a>.
    698       </p>
     677      <p id="rfc.section.1.p.1">This part is now obsolete. Please see HTTPbis, Part 2.</p>
    699678      <h2 id="rfc.section.1.1"><a href="#rfc.section.1.1">1.1</a>&nbsp;<a id="terminology" href="#terminology">Terminology</a></h2>
    700679      <p id="rfc.section.1.1.p.1">This specification uses a number of terms to refer to the roles played by participants in, and objects of, the HTTP communication.</p>
    … …  
    12881267      </p>
    12891268      <div class="note" id="rfc.section.6.4.p.7">
    1290          <p> <b>Note:</b> The "Basic Filtering" scheme (<a href="#RFC4647" id="rfc.xref.RFC4647.4"><cite title="Matching of Language Tags">[RFC4647]</cite></a>, <a href="http://tools.ietf.org/html/rfc4647#section-3.3.1">Section 3.3.1</a>) is identical to the matching scheme that was previously defined in <a href="http://tools.ietf.org/html/rfc2616#section-14.4">Section 14.4</a> of <a href="#RFC2616" id="rfc.xref.RFC2616.2"><cite title="Hypertext Transfer Protocol -- HTTP/1.1">[RFC2616]</cite></a>.
     1269         <p> <b>Note:</b> The "Basic Filtering" scheme (<a href="#RFC4647" id="rfc.xref.RFC4647.4"><cite title="Matching of Language Tags">[RFC4647]</cite></a>, <a href="http://tools.ietf.org/html/rfc4647#section-3.3.1">Section 3.3.1</a>) is identical to the matching scheme that was previously defined in <a href="http://tools.ietf.org/html/rfc2616#section-14.4">Section 14.4</a> of <a href="#RFC2616" id="rfc.xref.RFC2616.1"><cite title="Hypertext Transfer Protocol -- HTTP/1.1">[RFC2616]</cite></a>.
    12911270         </p>
    12921271      </div>
    … …  
    17421721      <h2 id="rfc.section.D.1"><a href="#rfc.section.D.1">D.1</a>&nbsp;Since RFC 2616
    17431722      </h2>
    1744       <p id="rfc.section.D.1.p.1">Extracted relevant partitions from <a href="#RFC2616" id="rfc.xref.RFC2616.3"><cite title="Hypertext Transfer Protocol -- HTTP/1.1">[RFC2616]</cite></a>.
     1723      <p id="rfc.section.D.1.p.1">Extracted relevant partitions from <a href="#RFC2616" id="rfc.xref.RFC2616.2"><cite title="Hypertext Transfer Protocol -- HTTP/1.1">[RFC2616]</cite></a>.
    17451724      </p>
    17461725      <h2 id="rfc.section.D.2"><a href="#rfc.section.D.2">D.2</a>&nbsp;Since draft-ietf-httpbis-p3-payload-00
    … …  
    21292108                     </ul>
    21302109                  </li>
    2131                   <li><em>RFC2616</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC2616.1">1</a>, <a href="#rfc.xref.RFC2616.2">6.4</a>, <a href="#RFC2616"><b>9.2</b></a>, <a href="#rfc.xref.RFC2616.3">D.1</a><ul>
    2132                         <li><em>Section 14.4</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC2616.2">6.4</a></li>
     2110                  <li><em>RFC2616</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC2616.1">6.4</a>, <a href="#RFC2616"><b>9.2</b></a>, <a href="#rfc.xref.RFC2616.2">D.1</a><ul>
     2111                        <li><em>Section 14.4</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC2616.1">6.4</a></li>
    21332112                     </ul>
    21342113                  </li>

  • draft-ietf-httpbis/latest/p3-payload.xml

    r1639 r1640  
    117117<abstract>
    118118<t>
    119    The Hypertext Transfer Protocol (HTTP) is an application-level protocol for
    120    distributed, collaborative, hypertext information systems. HTTP has been in
    121    use by the World Wide Web global information initiative since 1990. This
    122    document is Part 3 of the seven-part specification that defines the protocol
    123    referred to as "HTTP/1.1" and, taken together, obsoletes RFC 2616.
    124 </t>
    125 <t>
    126    Part 3 defines HTTP message content, metadata, and content negotiation.
     119  This part is now obsolete. Please see HTTPbis, Part 2.
    127120</t>
    128121</abstract>
    129 
    130 <note title="Editorial Note (To be removed by RFC Editor)">
    131   <t>
    132     Discussion of this draft should take place on the HTTPBIS working group
    133     mailing list (ietf-http-wg@w3.org), which is archived at
    134     <eref target="http://lists.w3.org/Archives/Public/ietf-http-wg/"/>.
    135   </t>
    136   <t>
    137     The current issues list is at
    138     <eref target="http://tools.ietf.org/wg/httpbis/trac/report/3"/> and related
    139     documents (including fancy diffs) can be found at
    140     <eref target="http://tools.ietf.org/wg/httpbis/"/>.
    141   </t>
    142   <t>
    143     The changes in this draft are summarized in <xref target="changes.since.19"/>.
    144   </t>
    145 </note>
    146122</front>
    147123<middle>
    148124<section title="Introduction" anchor="introduction">
    149125<t>
    150    This document defines HTTP/1.1 message payloads (a.k.a., content), the
    151    associated metadata header fields that define how the payload is intended
    152    to be interpreted by a recipient, the request header fields that
    153    might influence content selection, and the various selection algorithms
    154    that are collectively referred to as HTTP content negotiation.
    155 </t>
    156 <t>
    157    This document is currently disorganized in order to minimize the changes
    158    between drafts and enable reviewers to see the smaller errata changes.
    159    A future draft will reorganize the sections to better reflect the content.
    160    In particular, the sections on entities will be renamed payload and moved
    161    to the first half of the document, while the sections on content negotiation
    162    and associated request header fields will be moved to the second half.  The
    163    current mess reflects how widely dispersed these topics and associated
    164    requirements had become in <xref target="RFC2616"/>.
     126  This part is now obsolete. Please see HTTPbis, Part 2.
    165127</t>
    166128
Note: See TracChangeset for help on using the changeset viewer.