Ticket #173: 173.diff

File 173.diff, 5.1 KB (added by julian.reschke@…, 10 years ago)

Proposed patch for part 1.

  • p1-messaging.xml

     
    452452</t>
    453453<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="quoted-string"/><iref primary="true" item="Grammar" subitem="qdtext"/><iref primary="true" item="Grammar" subitem="obs-text"/>
    454454  <x:ref>quoted-string</x:ref>  = <x:ref>DQUOTE</x:ref> *( <x:ref>qdtext</x:ref> / <x:ref>quoted-pair</x:ref> ) <x:ref>DQUOTE</x:ref>
    455   <x:ref>qdtext</x:ref>         = <x:ref>OWS</x:ref> / %x21 / %x23-5B / %x5D-7E / <x:ref>obs-text</x:ref>
    456                  ; <x:ref>OWS</x:ref> / &lt;<x:ref>VCHAR</x:ref> except <x:ref>DQUOTE</x:ref> and "\"&gt; / <x:ref>obs-text</x:ref>
     455  <x:ref>qdtext</x:ref>         = <x:ref>WSP</x:ref> / %x21 / %x23-5B / %x5D-7E / <x:ref>obs-text</x:ref>
     456                 ; <x:ref>WSP</x:ref> / &lt;<x:ref>VCHAR</x:ref> except <x:ref>DQUOTE</x:ref> and "\"&gt; / <x:ref>obs-text</x:ref>
    457457  <x:ref>obs-text</x:ref>       = %x80-FF
    458458</artwork></figure>
    459459<t anchor="rule.quoted-pair">
    460460  <x:anchor-alias value="quoted-pair"/>
    461   <x:anchor-alias value="quoted-text"/>
    462    The backslash character ("\") &MAY; be used as a single-character
    463    quoting mechanism only within quoted-string and comment constructs.
     461   The backslash character ("\") can be used as a single-character quoting
     462         mechanism only within quoted-string and comment constructs:
    464463</t>
    465 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="quoted-text"/><iref primary="true" item="Grammar" subitem="quoted-pair"/>
    466   <x:ref>quoted-text</x:ref>    = %x01-09 /
    467                    %x0B-0C /
    468                    %x0E-FF ; Characters excluding NUL, <x:ref>CR</x:ref> and <x:ref>LF</x:ref>
    469   <x:ref>quoted-pair</x:ref>    = "\" <x:ref>quoted-text</x:ref>
     464<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="quoted-pair"/>
     465  <x:ref>quoted-pair</x:ref>    = "\" ( <x:ref>WSP</x:ref> / <x:ref>VCHAR</x:ref> / <x:ref>obs-text</x:ref> )
    470466</artwork></figure>
     467<t>
     468         Note that quoted-pair includes those characters otherwise disallowed in
     469         quoted-string or comment (<xref target="header.fields"/>).
     470</t>
    471471</section>
    472472
    473473<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
     
    11641164</t>
    11651165<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="comment"/><iref primary="true" item="Grammar" subitem="ctext"/>
    11661166  <x:ref>comment</x:ref>        = "(" *( <x:ref>ctext</x:ref> / <x:ref>quoted-pair</x:ref> / <x:ref>comment</x:ref> ) ")"
    1167   <x:ref>ctext</x:ref>          = <x:ref>OWS</x:ref> / %x21-27 / %x2A-5B / %x5D-7E / <x:ref>obs-text</x:ref>
    1168                  ; <x:ref>OWS</x:ref> / &lt;<x:ref>VCHAR</x:ref> except "(", ")", and "\"&gt; / <x:ref>obs-text</x:ref>
     1167  <x:ref>ctext</x:ref>          = <x:ref>WSP</x:ref> / %x21-27 / %x2A-5B / %x5D-7E / <x:ref>obs-text</x:ref>
     1168                 ; <x:ref>WSP</x:ref> / &lt;<x:ref>VCHAR</x:ref> except "(", ")", and "\"&gt; / <x:ref>obs-text</x:ref>
    11691169</artwork></figure>
    11701170 
    11711171</section>
     
    46074607<t>
    46084608  Rules about implicit linear whitespace between certain grammar productions
    46094609  have been removed; now it's only allowed when specifically pointed out
    4610   in the ABNF. The NUL character is no longer allowed in comment and quoted-string
    4611   text. The quoted-pair rule no longer allows escaping NUL, CR or LF.
     4610  in the ABNF. Control characters other than HTAB are no longer allowed in
     4611        comment and quoted-string text (escaped or not).
    46124612  Non-ASCII content in header fields and reason phrase has been obsoleted and
    46134613  made opaque (the TEXT rule was removed)
    46144614  (<xref target="basic.rules"/>)
     
    47204720<x:ref>chunk-size</x:ref> = 1*HEXDIG
    47214721<x:ref>comment</x:ref> = "(" *( ctext / quoted-pair / comment ) ")"
    47224722<x:ref>connection-token</x:ref> = token
    4723 <x:ref>ctext</x:ref> = OWS / %x21-27 ; '!'-'''
     4723<x:ref>ctext</x:ref> = WSP / %x21-27 ; '!'-'''
    47244724 / %x2A-5B ; '*'-'['
    47254725 / %x5D-7E ; ']'-'~'
    47264726 / obs-text
     
    47914791<x:ref>protocol-version</x:ref> = token
    47924792<x:ref>pseudonym</x:ref> = token
    47934793
    4794 <x:ref>qdtext</x:ref> = OWS / "!" / %x23-5B ; '#'-'['
     4794<x:ref>qdtext</x:ref> = WSP / "!" / %x23-5B ; '#'-'['
    47954795 / %x5D-7E ; ']'-'~'
    47964796 / obs-text
    47974797<x:ref>query</x:ref> = &lt;query, defined in [RFC3986], Section 3.4&gt;
    4798 <x:ref>quoted-pair</x:ref> = "\" quoted-text
     4798<x:ref>quoted-pair</x:ref> = "\" ( WSP / VCHAR / obs-text )
    47994799<x:ref>quoted-string</x:ref> = DQUOTE *( qdtext / quoted-pair ) DQUOTE
    4800 <x:ref>quoted-text</x:ref> = %x01-09 / %x0B-0C / %x0E-FF
    48014800<x:ref>qvalue</x:ref> = ( "0" [ "." *3DIGIT ] ) / ( "1" [ "." *3"0" ] )
    48024801
    48034802<x:ref>received-by</x:ref> = ( uri-host [ ":" port ] ) / pseudonym
     
    52555254      "take over HTTP Upgrade Token Registry"
    52565255    </t>
    52575256    <t>
     5257      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/173"/>:
     5258      "CR and LF in chunk extension values"
     5259    </t>
     5260    <t>
    52585261      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/184"/>:
    52595262      "HTTP/0.9 support"
    52605263    </t>