* WGs marked with an * asterisk has had at least one new draft made available during the last 5 days

Ticket #327: 327.diff

File 327.diff, 5.6 KB (added by julian.reschke@gmx.de, 3 years ago)

Proposed patch

  • p2-semantics.xml

     
    364364  <x:anchor-alias value="obs-text"/> 
    365365  <x:anchor-alias value="quoted-string"/> 
    366366  <x:anchor-alias value="token"/> 
     367  <x:anchor-alias value="BWS"/> 
    367368  <x:anchor-alias value="OWS"/> 
    368369  <x:anchor-alias value="RWS"/> 
    369370<t> 
    370371  The core rules below are defined in <xref target="Part1"/>: 
    371372</t> 
    372373<figure><artwork type="abnf2616"> 
     374  <x:ref>BWS</x:ref>           = &lt;BWS, defined in &basic-rules;&gt; 
    373375  <x:ref>OWS</x:ref>           = &lt;OWS, defined in &basic-rules;&gt; 
    374376  <x:ref>RWS</x:ref>           = &lt;RWS, defined in &basic-rules;&gt; 
    375377  <x:ref>obs-text</x:ref>      = &lt;obs-text, defined in &basic-rules;&gt; 
     
    25732575  <iref primary="true" item="Header Fields" subitem="Expect" x:for-anchor=""/> 
    25742576  <x:anchor-alias value="Expect"/> 
    25752577  <x:anchor-alias value="expectation"/> 
    2576   <x:anchor-alias value="expectation-extension"/> 
    25772578  <x:anchor-alias value="expect-param"/> 
     2579  <x:anchor-alias value="expect-name"/> 
     2580  <x:anchor-alias value="expect-value"/> 
    25782581<t> 
    25792582   The "Expect" header field is used to indicate that particular 
    25802583   server behaviors are required by the client. 
    25812584</t> 
    2582 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Expect"/><iref primary="true" item="Grammar" subitem="expectation"/><iref primary="true" item="Grammar" subitem="expectation-extension"/><iref primary="true" item="Grammar" subitem="expect-param"/> 
     2585<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Expect"/><iref primary="true" item="Grammar" subitem="expectation"/><iref primary="true" item="Grammar" subitem="expect-param"/><iref primary="true" item="Grammar" subitem="expect-value"/><iref primary="true" item="Grammar" subitem="expect-name"/> 
    25832586  <x:ref>Expect</x:ref>       = 1#<x:ref>expectation</x:ref> 
    25842587   
    2585   <x:ref>expectation</x:ref>  = "100-continue" / <x:ref>expectation-extension</x:ref> 
    2586   <x:ref>expectation-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) 
    2587                            *(";" <x:ref>expect-param</x:ref>) ] 
    2588   <x:ref>expect-param</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ] 
     2588  <x:ref>expectation</x:ref>  = <x:ref>expect-name</x:ref> [ <x:ref>BWS</x:ref> "=" <x:ref>BWS</x:ref> <x:ref>expect-value</x:ref> ] 
     2589                             *( <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> <x:ref>expect-param</x:ref> ) 
     2590  <x:ref>expect-param</x:ref> = <x:ref>expect-name</x:ref> [ <x:ref>BWS</x:ref> "=" <x:ref>BWS</x:ref> <x:ref>expect-value</x:ref> ] 
     2591   
     2592  <x:ref>expect-name</x:ref>  = <x:ref>token</x:ref> 
     2593  <x:ref>expect-value</x:ref> = <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> 
    25892594</artwork></figure> 
    25902595<t> 
    25912596   A server that does not understand or is unable to comply with any of 
     
    25982603<t> 
    25992604   This header field is defined with extensible syntax to allow for 
    26002605   future extensions. If a server receives a request containing an 
    2601    Expect field that includes an expectation-extension that it does not 
     2606   Expect field that includes an expectation that it does not 
    26022607   support, it &MUST; respond with a 417 (Expectation Failed) status code. 
    26032608</t> 
    26042609<t> 
    2605    Comparison of expectation values is case-insensitive for unquoted 
    2606    tokens (including the 100-continue token), and is case-sensitive for 
    2607    quoted-string expectation-extensions. 
     2610   The only expectation defined by this specification is: 
    26082611</t> 
    26092612<t> 
     2613  100-continue 
     2614   <list> 
     2615      <t> 
     2616        Defined in &use100; 
     2617      </t> 
     2618   </list> 
     2619</t> 
     2620<t> 
     2621   Comparison is case-insensitive for names (expect-name), and is 
     2622   case-sensitive for values (expect-value). 
     2623</t> 
     2624<t> 
    26102625   The Expect mechanism is hop-by-hop: that is, an HTTP/1.1 proxy &MUST; 
    26112626   return a 417 (Expectation Failed) status code if it receives a request 
    26122627   with an expectation that it cannot meet. However, the Expect 
     
    26172632   Many older HTTP/1.0 and HTTP/1.1 applications do not understand the 
    26182633   Expect header field. 
    26192634</t> 
    2620 <t> 
    2621    See &use100; for the use of the 100 (Continue) status code. 
    2622 </t> 
    26232635</section> 
    26242636 
    26252637<section title="From" anchor="header.from"> 
     
    40274039<artwork type="abnf" name="p2-semantics.parsed-abnf"> 
    40284040<x:ref>Allow</x:ref> = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ] 
    40294041 
     4042<x:ref>BWS</x:ref> = &lt;BWS, defined in [Part1], Section 1.2.2&gt; 
     4043 
    40304044<x:ref>Date</x:ref> = HTTP-date 
    40314045 
    40324046<x:ref>Expect</x:ref> = *( "," OWS ) expectation *( OWS "," [ OWS expectation ] ) 
     
    40804094 / %x53.75.6E.64.61.79 ; Sunday 
    40814095<x:ref>delta-seconds</x:ref> = 1*DIGIT 
    40824096 
    4083 <x:ref>expect-param</x:ref> = token [ "=" ( token / quoted-string ) ] 
    4084 <x:ref>expectation</x:ref> = "100-continue" / expectation-extension 
    4085 <x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string ) *( ";" 
    4086  expect-param ) ] 
     4097<x:ref>expect-name</x:ref> = token 
     4098<x:ref>expect-param</x:ref> = expect-name [ BWS "=" BWS expect-value ] 
     4099<x:ref>expect-value</x:ref> = token / quoted-string 
     4100<x:ref>expectation</x:ref> = expect-name [ BWS "=" BWS expect-value ] *( OWS ";" OWS 
     4101 expect-param ) 
    40874102 
    40884103<x:ref>hour</x:ref> = 2DIGIT 
    40894104 
     
    47014716      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/312"/>: 
    47024717      "should there be a permanent variant of 307" 
    47034718    </t> 
     4719    <t> 
     4720      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/327"/>: 
     4721      "'expect' grammar missing OWS" 
     4722    </t> 
    47044723  </list> 
    47054724</t> 
    47064725</section>