Ticket #43: i43.diff

File i43.diff, 8.5 KB (added by julian.reschke@…, 13 years ago)

Proposed patch for parts 1 & 2.

  • p1-messaging.xml

     
    857857   that can be used to interact with a resource via HTTP. More information on
    858858   the scope of URIs and resources can be found in <xref target="RFC3986"/>.
    859859</t>
    860   <x:anchor-alias value="URI"/>
    861860  <x:anchor-alias value="URI-reference"/>
    862861  <x:anchor-alias value="absolute-URI"/>
    863862  <x:anchor-alias value="relative-part"/>
    … …  
    876875   protocol elements that allow a relative URI without a fragment.
    877876</t>
    878877<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="URI-reference"/><iref primary="true" item="Grammar" subitem="absolute-URI"/><iref primary="true" item="Grammar" subitem="authority"/><iref primary="true" item="Grammar" subitem="path-absolute"/><iref primary="true" item="Grammar" subitem="port"/><iref primary="true" item="Grammar" subitem="query"/><iref primary="true" item="Grammar" subitem="uri-host"/>
    879   <x:ref>URI</x:ref>           = &lt;URI, defined in <xref target="RFC3986" x:fmt="," x:sec="3"/>&gt;
    880878  <x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in <xref target="RFC3986" x:fmt="," x:sec="4.1"/>&gt;
    881879  <x:ref>absolute-URI</x:ref>  = &lt;absolute-URI, defined in <xref target="RFC3986" x:fmt="," x:sec="4.3"/>&gt;
    882880  <x:ref>relative-part</x:ref> = &lt;relative-part, defined in <xref target="RFC3986" x:fmt="," x:sec="4.2"/>&gt;
    … …  
    48644862<x:ref>Transfer-Encoding-v</x:ref> = *( "," OWS ) transfer-coding *( OWS "," [ OWS
    48654863 transfer-coding ] )
    48664864
    4867 <x:ref>URI</x:ref> = &lt;URI, defined in [RFC3986], Section 3&gt;
    48684865<x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in [RFC3986], Section 4.1&gt;
    48694866<x:ref>Upgrade</x:ref> = "Upgrade:" OWS Upgrade-v
    48704867<x:ref>Upgrade-v</x:ref> = *( "," OWS ) product *( OWS "," [ OWS product ] )
    … …  
    50165013; Request defined but not used
    50175014; Response defined but not used
    50185015; TE defined but not used
    5019 ; URI defined but not used
    50205016; URI-reference defined but not used
    50215017; http-URI defined but not used
    50225018; https-URI defined but not used

  • p2-semantics.xml

     
    361361  <x:anchor-alias value="Proxy-Authorization"/>
    362362  <x:anchor-alias value="Range"/>
    363363  <x:anchor-alias value="TE"/>
    364   <x:anchor-alias value="URI"/>
     364  <x:anchor-alias value="URI-reference"/>
    365365  <x:anchor-alias value="Vary"/>
    366366  <x:anchor-alias value="WWW-Authenticate"/>
    367367<t>
    … …  
    375375  <x:ref>partial-URI</x:ref>   = &lt;partial-URI, defined in &uri;&gt;
    376376  <x:ref>product</x:ref>       = &lt;product, defined in &product-tokens;&gt;
    377377  <x:ref>TE</x:ref>            = &lt;TE, defined in &header-te;&gt;
    378   <x:ref>URI</x:ref>           = &lt;URI, defined in &uri;&gt;
     378  <x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in &uri;&gt;
    379379</artwork></figure>
    380380<figure><!--Part3--><artwork type="abnf2616">
    381381  <x:ref>Accept</x:ref>        = &lt;Accept, defined in &header-accept;&gt;
    … …  
    20412041   resource.
    20422042</t>
    20432043<t>
    2044    The field value consists of a single URI.
     2044   The field value consists of a single URI-reference. When it has the form
     2045   of a relative reference (<xref target="RFC3986" x:fmt="," x:sec="4.2"/>),
     2046   the final value is computed by resolving it against the effective request
     2047   URI (<xref target="RFC3986" x:fmt="," x:sec="5"/>).
    20452048</t>
    20462049<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Location"/><iref primary="true" item="Grammar" subitem="Location-v"/>
    20472050  <x:ref>Location</x:ref>       = "Location" ":" <x:ref>OWS</x:ref> <x:ref>Location-v</x:ref>
    2048   <x:ref>Location-v</x:ref>     = <x:ref>URI</x:ref>
     2051  <x:ref>Location-v</x:ref>     = <x:ref>URI-reference</x:ref>
    20492052</artwork></figure>
    2050 <t>
    2051    An example is:
    2052 </t>
    2053 <figure><artwork type="example">
    2054   Location: http://www.example.org/pub/WWW/People.html
     2053<figure>
     2054<preamble>Examples are:</preamble>
     2055<artwork type="example">
     2056  Location: http://www.example.org/pub/WWW/People.html#tim
     2057</artwork></figure><figure><artwork type="example">
     2058  Location: /index.html
    20552059</artwork></figure>
    20562060<t>
    2057    There are circumstances in which a fragment identifier in a Location URI would not be appropriate:
     2061   There are circumstances in which a fragment identifier in a Location URI
     2062   would not be appropriate:
    20582063   <list style="symbols">
    2059       <t>With a 201 Created response, because in this usage the Location header specifies the URI for the entire created resource.</t>
     2064      <t>With a 201 Created response, because in this usage the Location header
     2065      specifies the URI for the entire created resource.</t>
    20602066      <t>With 305 Use Proxy.</t>
    20612067   </list>
    20622068</t>
    20632069<x:note>
    20642070  <t>
     2071    <x:h>Note:</x:h> This specification does not define precedence rules
     2072    for the case where the original URI, as navigated to be the user
     2073    agent, and the Location header field value both contain fragment
     2074    identifiers.
     2075  </t>
     2076</x:note>
     2077<x:note>
     2078  <t>
    20652079    <x:h>Note:</x:h> The Content-Location header field (&header-content-location;) differs
    20662080    from Location in that the Content-Location identifies the original
    20672081    location of the entity enclosed in the response. It is therefore
    … …  
    30013015  <seriesInfo name="RFC" value="2119"/>
    30023016</reference>
    30033017
     3018<reference anchor="RFC3986">
     3019 <front>
     3020  <title abbrev='URI Generic Syntax'>Uniform Resource Identifier (URI): Generic Syntax</title>
     3021  <author initials='T.' surname='Berners-Lee' fullname='Tim Berners-Lee'>
     3022    <organization abbrev="W3C/MIT">World Wide Web Consortium</organization>
     3023    <address>
     3024       <email>timbl@w3.org</email>
     3025       <uri>http://www.w3.org/People/Berners-Lee/</uri>
     3026    </address>
     3027  </author>
     3028  <author initials='R.' surname='Fielding' fullname='Roy T. Fielding'>
     3029    <organization abbrev="Day Software">Day Software</organization>
     3030    <address>
     3031      <email>fielding@gbiv.com</email>
     3032      <uri>http://roy.gbiv.com/</uri>
     3033    </address>
     3034  </author>
     3035  <author initials='L.' surname='Masinter' fullname='Larry Masinter'>
     3036    <organization abbrev="Adobe Systems">Adobe Systems Incorporated</organization>
     3037    <address>
     3038      <email>LMM@acm.org</email>
     3039      <uri>http://larry.masinter.net/</uri>
     3040    </address>
     3041  </author>
     3042  <date month='January' year='2005'></date>
     3043 </front>
     3044 <seriesInfo name="RFC" value="3986"/>
     3045 <seriesInfo name="STD" value="66"/>
     3046</reference>
     3047
    30043048<reference anchor="RFC5234">
    30053049  <front>
    30063050    <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
    … …  
    32693313  (<xref target="header.allow"/>)
    32703314</t>
    32713315<t>
    3272   Correct syntax of Location header to allow fragment,
    3273   as referred symbol wasn't what was expected, and add some
    3274   clarifications as to when it would not be appropriate.
     3316  Correct syntax of Location header to allow URI references (including
     3317  relative references and fragments), as referred symbol "absoluteURI" wasn't
     3318  what was expected, and add some clarifications as to when use of fragments
     3319  would not be appropriate.
    32753320  (<xref target="header.location"/>)
    32763321</t>
    32773322<t>
    … …  
    33213366 &lt;If-Unmodified-Since, defined in [Part4], Section 6.5&gt;
    33223367
    33233368<x:ref>Location</x:ref> = "Location:" OWS Location-v
    3324 <x:ref>Location-v</x:ref> = URI
     3369<x:ref>Location-v</x:ref> = URI-reference
    33253370
    33263371<x:ref>Max-Forwards</x:ref> = "Max-Forwards:" OWS Max-Forwards-v
    33273372<x:ref>Max-Forwards-v</x:ref> = 1*DIGIT
    … …  
    33613406
    33623407<x:ref>TE</x:ref> = &lt;TE, defined in [Part1], Section 9.8&gt;
    33633408
    3364 <x:ref>URI</x:ref> = &lt;URI, defined in [Part1], Section 2.6&gt;
     3409<x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in [Part1], Section 2.6&gt;
    33653410<x:ref>User-Agent</x:ref> = "User-Agent:" OWS User-Agent-v
    33663411<x:ref>User-Agent-v</x:ref> = product *( RWS ( product / comment ) )
    33673412
    … …  
    37203765
    37213766<section title="Since draft-ietf-httpbis-p2-semantics-09" anchor="changes.since.09">
    37223767<t>
    3723   None yet.
     3768  Closed issues:
     3769  <list style="symbols">
     3770    <t>
     3771      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/43"/>:
     3772      "Fragment combination / precedence during redirects"
     3773    </t>
     3774  </list>
    37243775</t>
     3776<t>
     3777  Partly resolved issues:
     3778  <list style="symbols">
     3779    <t>
     3780      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/185"/>:
     3781      "Location header payload handling"
     3782    </t>
     3783  </list>
     3784</t>
    37253785</section>
    37263786
    37273787</section>