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

Changeset 1489


Ignore:
Timestamp:
2011-12-06 11:13:43 (3 years ago)
Author:
julian.reschke@gmx.de
Message:

sanitize Expect grammar (editorial)

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

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/httpbis.abnf

    r1478 r1489  
    128128etagc = "!" / %x23-7E ; '#'-'~' 
    129129 / obs-text 
    130 expect-params = ";" token [ "=" ( token / quoted-string ) ] 
     130expect-param = token [ "=" ( token / quoted-string ) ] 
    131131expectation = "100-continue" / expectation-extension 
    132 expectation-extension = token [ "=" ( token / quoted-string ) *expect-params ] 
     132expectation-extension = token [ "=" ( token / quoted-string ) *( ";" expect-param ) ] 
    133133extension-pragma = token [ "=" ( token / quoted-string ) ] 
    134134field-content = *( HTAB / SP / VCHAR / obs-text ) 
  • draft-ietf-httpbis/latest/p2-semantics.html

    r1486 r1489  
    359359  }  
    360360  @bottom-center { 
    361        content: "Expires June 7, 2012";  
     361       content: "Expires June 8, 2012";  
    362362  }  
    363363  @bottom-right { 
     
    411411      <meta name="dct.creator" content="Reschke, J. F."> 
    412412      <meta name="dct.identifier" content="urn:ietf:id:draft-ietf-httpbis-p2-semantics-latest"> 
    413       <meta name="dct.issued" scheme="ISO8601" content="2011-12-05"> 
     413      <meta name="dct.issued" scheme="ISO8601" content="2011-12-06"> 
    414414      <meta name="dct.replaces" content="urn:ietf:rfc:2616"> 
    415415      <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."> 
     
    442442            </tr> 
    443443            <tr> 
    444                <td class="left">Expires: June 7, 2012</td> 
     444               <td class="left">Expires: June 8, 2012</td> 
    445445               <td class="right">HP</td> 
    446446            </tr> 
     
    495495            <tr> 
    496496               <td class="left"></td> 
    497                <td class="right">December 5, 2011</td> 
     497               <td class="right">December 6, 2011</td> 
    498498            </tr> 
    499499         </tbody> 
     
    525525         in progress”. 
    526526      </p> 
    527       <p>This Internet-Draft will expire on June 7, 2012.</p> 
     527      <p>This Internet-Draft will expire on June 8, 2012.</p> 
    528528      <h1><a id="rfc.copyrightnotice" href="#rfc.copyrightnotice">Copyright Notice</a></h1> 
    529529      <p>Copyright © 2011 IETF Trust and the persons identified as the document authors. All rights reserved.</p> 
     
    22342234  <a href="#header.expect" class="smpl">expectation</a>  = "100-continue" / <a href="#header.expect" class="smpl">expectation-extension</a> 
    22352235  <a href="#header.expect" class="smpl">expectation-extension</a> = <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) 
    2236                            *<a href="#header.expect" class="smpl">expect-params</a> ] 
    2237   <a href="#header.expect" class="smpl">expect-params</a> = ";" <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) ] 
     2236                           *(";" <a href="#header.expect" class="smpl">expect-param</a>) ] 
     2237  <a href="#header.expect" class="smpl">expect-param</a> = <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) ] 
    22382238</pre><p id="rfc.section.9.3.p.3">A server that does not understand or is unable to comply with any of the expectation values in the Expect field of a request <em class="bcp14">MUST</em> respond with appropriate error status code. The server <em class="bcp14">MUST</em> respond with a 417 (Expectation Failed) status code if any of the expectations cannot be met or, if there are other problems 
    22392239         with the request, some other 4xx status code. 
     
    30653065<a href="#rule.delta-seconds" class="smpl">delta-seconds</a> = 1*DIGIT 
    30663066 
    3067 <a href="#header.expect" class="smpl">expect-params</a> = ";" token [ "=" ( token / quoted-string ) ] 
     3067<a href="#header.expect" class="smpl">expect-param</a> = token [ "=" ( token / quoted-string ) ] 
    30683068<a href="#header.expect" class="smpl">expectation</a> = "100-continue" / expectation-extension 
    3069 <a href="#header.expect" class="smpl">expectation-extension</a> = token [ "=" ( token / quoted-string ) 
    3070  *expect-params ] 
     3069<a href="#header.expect" class="smpl">expectation-extension</a> = token [ "=" ( token / quoted-string ) *( ";" 
     3070 expect-param ) ] 
    30713071 
    30723072<a href="#preferred.date.format" class="smpl">hour</a> = 2DIGIT 
     
    35003500                        <li><tt>delta-seconds</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.33"><b>9.8</b></a></li> 
    35013501                        <li><tt>Expect</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.24"><b>9.3</b></a></li> 
    3502                         <li><tt>expect-params</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.27"><b>9.3</b></a></li> 
     3502                        <li><tt>expect-param</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.27"><b>9.3</b></a></li> 
    35033503                        <li><tt>expectation</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.25"><b>9.3</b></a></li> 
    35043504                        <li><tt>expectation-extension</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.26"><b>9.3</b></a></li> 
  • draft-ietf-httpbis/latest/p2-semantics.xml

    r1486 r1489  
    25752575  <x:anchor-alias value="expectation"/> 
    25762576  <x:anchor-alias value="expectation-extension"/> 
    2577   <x:anchor-alias value="expect-params"/> 
     2577  <x:anchor-alias value="expect-param"/> 
    25782578<t> 
    25792579   The "Expect" header field is used to indicate that particular 
    25802580   server behaviors are required by the client. 
    25812581</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-params"/> 
     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"/> 
    25832583  <x:ref>Expect</x:ref>       = 1#<x:ref>expectation</x:ref> 
    25842584   
    25852585  <x:ref>expectation</x:ref>  = "100-continue" / <x:ref>expectation-extension</x:ref> 
    25862586  <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-params</x:ref> ] 
    2588   <x:ref>expect-params</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> ) ] 
    25892589</artwork></figure> 
    25902590<t> 
     
    40814081<x:ref>delta-seconds</x:ref> = 1*DIGIT 
    40824082 
    4083 <x:ref>expect-params</x:ref> = ";" token [ "=" ( token / quoted-string ) ] 
     4083<x:ref>expect-param</x:ref> = token [ "=" ( token / quoted-string ) ] 
    40844084<x:ref>expectation</x:ref> = "100-continue" / expectation-extension 
    4085 <x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string ) 
    4086  *expect-params ] 
     4085<x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string ) *( ";" 
     4086 expect-param ) ] 
    40874087 
    40884088<x:ref>hour</x:ref> = 2DIGIT 
Note: See TracChangeset for help on using the changeset viewer.