Changeset 1489 for draft-ietf-httpbis/latest

Timestamp:

06/12/11 19:13:43 (9 years ago)

Author:

julian.reschke@…

Message:

sanitize Expect grammar (editorial)

Location:

draft-ietf-httpbis/latest

Files:

• httpbis.abnf (modified) (1 diff)
• p2-semantics.html (modified) (8 diffs)
• p2-semantics.xml (modified) (2 diffs)

draft-ietf-httpbis/latest/httpbis.abnf

@@ -128 +128 @@
 etagc = "!" / %x23-7E ; '#'-'~'
  / obs-text
-expect-params = ";" token [ "=" ( token / quoted-string ) ]
+expect-param = token [ "=" ( token / quoted-string ) ]
 expectation = "100-continue" / expectation-extension
-expectation-extension = token [ "=" ( token / quoted-string ) *expect-params ]
+expectation-extension = token [ "=" ( token / quoted-string ) *( ";" expect-param ) ]
 extension-pragma = token [ "=" ( token / quoted-string ) ]
 field-content = *( HTAB / SP / VCHAR / obs-text )

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

@@ -359 +359 @@
   } 
   @bottom-center {
-       content: "Expires June 7, 2012"; 
+       content: "Expires June 8, 2012"; 
   } 
   @bottom-right {
@@ -411 +411 @@
       <meta name="dct.creator" content="Reschke, J. F.">
       <meta name="dct.identifier" content="urn:ietf:id:draft-ietf-httpbis-p2-semantics-latest">
-      <meta name="dct.issued" scheme="ISO8601" content="2011-12-05">
+      <meta name="dct.issued" scheme="ISO8601" content="2011-12-06">
       <meta name="dct.replaces" content="urn:ietf:rfc:2616">
       <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.">
@@ -442 +442 @@
             </tr>
             <tr>
-               <td class="left">Expires: June 7, 2012</td>
+               <td class="left">Expires: June 8, 2012</td>
                <td class="right">HP</td>
             </tr>
@@ -495 +495 @@
             <tr>
                <td class="left"></td>
-               <td class="right">December 5, 2011</td>
+               <td class="right">December 6, 2011</td>
             </tr>
          </tbody>
@@ -525 +525 @@
          in progress”.
       </p>
-      <p>This Internet-Draft will expire on June 7, 2012.</p>
+      <p>This Internet-Draft will expire on June 8, 2012.</p>
       <h1><a id="rfc.copyrightnotice" href="#rfc.copyrightnotice">Copyright Notice</a></h1>
       <p>Copyright © 2011 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
@@ -2234 +2234 @@
   <a href="#header.expect" class="smpl">expectation</a>  = "100-continue" / <a href="#header.expect" class="smpl">expectation-extension</a>
   <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> )
-                           *<a href="#header.expect" class="smpl">expect-params</a> ]
-  <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> ) ]
+                           *(";" <a href="#header.expect" class="smpl">expect-param</a>) ]
+  <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> ) ]
 </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
          with the request, some other 4xx status code.
@@ -3065 +3065 @@
 <a href="#rule.delta-seconds" class="smpl">delta-seconds</a> = 1*DIGIT
 
-<a href="#header.expect" class="smpl">expect-params</a> = ";" token [ "=" ( token / quoted-string ) ]
+<a href="#header.expect" class="smpl">expect-param</a> = token [ "=" ( token / quoted-string ) ]
 <a href="#header.expect" class="smpl">expectation</a> = "100-continue" / expectation-extension
-<a href="#header.expect" class="smpl">expectation-extension</a> = token [ "=" ( token / quoted-string )
- *expect-params ]
+<a href="#header.expect" class="smpl">expectation-extension</a> = token [ "=" ( token / quoted-string ) *( ";"
+ expect-param ) ]
 
 <a href="#preferred.date.format" class="smpl">hour</a> = 2DIGIT
@@ -3500 +3500 @@
                         <li><tt>delta-seconds</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.33"><b>9.8</b></a></li>
                         <li><tt>Expect</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.24"><b>9.3</b></a></li>
-                        <li><tt>expect-params</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.27"><b>9.3</b></a></li>
+                        <li><tt>expect-param</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.27"><b>9.3</b></a></li>
                         <li><tt>expectation</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.25"><b>9.3</b></a></li>
                         <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

@@ -2575 +2575 @@
   <x:anchor-alias value="expectation"/>
   <x:anchor-alias value="expectation-extension"/>
-  <x:anchor-alias value="expect-params"/>
+  <x:anchor-alias value="expect-param"/>
 <t>
    The "Expect" header field is used to indicate that particular
    server behaviors are required by the client.
 </t>
-<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"/>
+<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"/>
   <x:ref>Expect</x:ref>       = 1#<x:ref>expectation</x:ref>
   
   <x:ref>expectation</x:ref>  = "100-continue" / <x:ref>expectation-extension</x:ref>
   <x:ref>expectation-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> )
-                           *<x:ref>expect-params</x:ref> ]
-  <x:ref>expect-params</x:ref> = ";" <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
+                           *(";" <x:ref>expect-param</x:ref>) ]
+  <x:ref>expect-param</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
 </artwork></figure>
 <t>
@@ -4081 +4081 @@
 <x:ref>delta-seconds</x:ref> = 1*DIGIT
 
-<x:ref>expect-params</x:ref> = ";" token [ "=" ( token / quoted-string ) ]
+<x:ref>expect-param</x:ref> = token [ "=" ( token / quoted-string ) ]
 <x:ref>expectation</x:ref> = "100-continue" / expectation-extension
-<x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string )
- *expect-params ]
+<x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string ) *( ";"
+ expect-param ) ]
 
 <x:ref>hour</x:ref> = 2DIGIT