Changeset 370 for draft-ietf-httpbis/latest/p3-payload.html

Timestamp:

13/11/08 20:18:58 (14 years ago)

Author:

julian.reschke@…

Message:

Rewrite header ABNFs to spell out whitespace rules, factor out value format definitions. (related to #36)

File:

• draft-ietf-httpbis/latest/p3-payload.html (modified) (8 diffs)

draft-ietf-httpbis/latest/p3-payload.html

@@ -631 +631 @@
       </p>
       <h1 id="rfc.section.2"><a href="#rfc.section.2">2.</a>&nbsp;<a id="notation" href="#notation">Notational Conventions and Generic Grammar</a></h1>
-      <p id="rfc.section.2.p.1">This specification uses the ABNF syntax defined in <a href="p1-messaging.html#notation.abnf" title="ABNF Extensions">Section 2.1</a> of <a href="#Part1" id="rfc.xref.Part1.1"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a> and the core rules defined in <a href="p1-messaging.html#basic.rules" title="Basic Rules">Section 2.2</a> of <a href="#Part1" id="rfc.xref.Part1.2"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a>: <span class="comment">[abnf.dep: ABNF syntax and basic rules will be adopted from RFC 5234, see &lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/36">http://tools.ietf.org/wg/httpbis/trac/ticket/36</a>&gt;.]</span> 
+      <p id="rfc.section.2.p.1">This specification uses the ABNF syntax defined in <a href="p1-messaging.html#notation.abnf" title="ABNF Extension: #rule">Section 2.1</a> of <a href="#Part1" id="rfc.xref.Part1.1"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a> and the core rules defined in <a href="p1-messaging.html#basic.rules" title="Basic Rules">Section 2.2</a> of <a href="#Part1" id="rfc.xref.Part1.2"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a>: <span class="comment">[abnf.dep: ABNF syntax and basic rules will be adopted from RFC 5234, see &lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/36">http://tools.ietf.org/wg/httpbis/trac/ticket/36</a>&gt;.]</span> 
       </p>
       <div id="rfc.figure.u.1"></div><pre class="inline">  <a href="#notation" class="smpl">ALPHA</a>          = &lt;ALPHA, defined in <a href="#Part1" id="rfc.xref.Part1.3"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a>, <a href="p1-messaging.html#basic.rules" title="Basic Rules">Section 2.2</a>&gt;
@@ -750 +750 @@
   <a href="#rule.parameter" class="smpl">value</a>          = <a href="#notation" class="smpl">token</a> / <a href="#notation" class="smpl">quoted-string</a>
 </pre><p id="rfc.section.3.3.p.5">The type, subtype, and parameter attribute names are case-insensitive. Parameter values might or might not be case-sensitive,
-         depending on the semantics of the parameter name. Linear white space (LWS) <em class="bcp14">MUST NOT</em> be used between the type and subtype, nor between an attribute and its value. The presence or absence of a parameter might
-         be significant to the processing of a media-type, depending on its definition within the media type registry.
+         depending on the semantics of the parameter name. The presence or absence of a parameter might be significant to the processing
+         of a media-type, depending on its definition within the media type registry.
       </p>
       <p id="rfc.section.3.3.p.6">A parameter value that matches the <a href="#notation" class="smpl">token</a> production may be transmitted as either a token or within a quoted-string. The quoted and unquoted values are equivalent.
@@ -969 +969 @@
                    / ( <a href="#media.types" class="smpl">type</a> "/" "*" )
                    / ( <a href="#media.types" class="smpl">type</a> "/" <a href="#media.types" class="smpl">subtype</a> )
-                   ) *( ";" <a href="#rule.parameter" class="smpl">parameter</a> )
-  <a href="#header.accept" class="smpl">accept-params</a>  = ";" "q" "=" <a href="#quality.values" class="smpl">qvalue</a> *( <a href="#header.accept" class="smpl">accept-extension</a> )
-  <a href="#header.accept" class="smpl">accept-extension</a> = ";" <a href="#notation" class="smpl">token</a> [ "=" ( <a href="#notation" class="smpl">token</a> / <a href="#notation" class="smpl">quoted-string</a> ) ]
+                   ) *( <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> <a href="#rule.parameter" class="smpl">parameter</a> )
+  <a href="#header.accept" class="smpl">accept-params</a>  = <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> "q=" <a href="#quality.values" class="smpl">qvalue</a> *( <a href="#header.accept" class="smpl">accept-ext</a> )
+  <a href="#header.accept" class="smpl">accept-ext</a>     = <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> <a href="#notation" class="smpl">token</a> [ "=" ( <a href="#notation" class="smpl">token</a> / <a href="#notation" class="smpl">quoted-string</a> ) ]
 </pre><p id="rfc.section.6.1.p.3">The asterisk "*" character is used to group media types into ranges, with "*/*" indicating all media types and "type/*" indicating
          all subtypes of that type. The media-range <em class="bcp14">MAY</em> include media type parameters that are applicable to that range.
@@ -1034 +1034 @@
       <div id="rfc.figure.u.24"></div><pre class="inline"><span id="rfc.iref.g.22"></span><span id="rfc.iref.g.23"></span>  <a href="#header.accept-charset" class="smpl">Accept-Charset</a>   = "Accept-Charset" ":" <a href="#notation" class="smpl">OWS</a>
           <a href="#header.accept-charset" class="smpl">Accept-Charset-v</a>
-  <a href="#header.accept-charset" class="smpl">Accept-Charset-v</a> = 1#( ( <a href="#rule.charset" class="smpl">charset</a> / "*" ) [ ";" "q" "=" <a href="#quality.values" class="smpl">qvalue</a> ] )
+  <a href="#header.accept-charset" class="smpl">Accept-Charset-v</a> = 1#( ( <a href="#rule.charset" class="smpl">charset</a> / "*" ) [ <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> "q=" <a href="#quality.values" class="smpl">qvalue</a> ] )
 </pre><p id="rfc.section.6.2.p.3">Character set values are described in <a href="#character.sets" title="Character Sets">Section&nbsp;3.1</a>. Each charset <em class="bcp14">MAY</em> be given an associated quality value which represents the user's preference for that charset. The default value is q=1. An
          example is
@@ -1055 +1055 @@
                      <a href="#header.accept-encoding" class="smpl">Accept-Encoding-v</a>
   <a href="#header.accept-encoding" class="smpl">Accept-Encoding-v</a>  = 
-                     #( <a href="#header.accept-encoding" class="smpl">codings</a> [ ";" "q" "=" <a href="#quality.values" class="smpl">qvalue</a> ] )
+                     #( <a href="#header.accept-encoding" class="smpl">codings</a> [ <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> "q=" <a href="#quality.values" class="smpl">qvalue</a> ] )
   <a href="#header.accept-encoding" class="smpl">codings</a>            = ( <a href="#content.codings" class="smpl">content-coding</a> / "*" )
 </pre><p id="rfc.section.6.3.p.3">Each codings value <em class="bcp14">MAY</em> be given an associated quality value which represents the preference for that encoding. The default value is q=1.
@@ -1105 +1105 @@
                     <a href="#header.accept-language" class="smpl">Accept-Language-v</a>
   <a href="#header.accept-language" class="smpl">Accept-Language-v</a> =
-                    1#( <a href="#header.accept-language" class="smpl">language-range</a> [ ";" "q" "=" <a href="#quality.values" class="smpl">qvalue</a> ] )
+                    1#( <a href="#header.accept-language" class="smpl">language-range</a> [ <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> "q=" <a href="#quality.values" class="smpl">qvalue</a> ] )
   <a href="#header.accept-language" class="smpl">language-range</a>    = 
             &lt;language-range, defined in <a href="#RFC4647" id="rfc.xref.RFC4647.1"><cite title="Matching of Language Tags">[RFC4647]</cite></a>, <a href="http://tools.ietf.org/html/rfc4647#section-2.1">Section 2.1</a>&gt;
@@ -1645 +1645 @@
       <div id="rfc.figure.u.40"></div><pre class="inline"><span id="rfc.iref.g.42"></span><span id="rfc.iref.g.43"></span><span id="rfc.iref.g.44"></span><span id="rfc.iref.g.45"></span><span id="rfc.iref.g.46"></span><span id="rfc.iref.g.47"></span><span id="rfc.iref.g.48"></span>  <a href="#content-disposition" class="smpl">content-disposition</a> = "Content-Disposition" ":" <a href="#notation" class="smpl">OWS</a>
                         <a href="#content-disposition" class="smpl">content-disposition-v</a>
-  <a href="#content-disposition" class="smpl">content-disposition-v</a> = <a href="#content-disposition" class="smpl">disposition-type</a> *( ";" <a href="#content-disposition" class="smpl">disposition-parm</a> )
+  <a href="#content-disposition" class="smpl">content-disposition-v</a> = <a href="#content-disposition" class="smpl">disposition-type</a> *( <a href="#notation" class="smpl">OWS</a> ";" <a href="#notation" class="smpl">OWS</a> <a href="#content-disposition" class="smpl">disposition-parm</a> )
   <a href="#content-disposition" class="smpl">disposition-type</a> = "attachment" / <a href="#content-disposition" class="smpl">disp-extension-token</a>
   <a href="#content-disposition" class="smpl">disposition-parm</a> = <a href="#content-disposition" class="smpl">filename-parm</a> / <a href="#content-disposition" class="smpl">disp-extension-parm</a>
@@ -1831 +1831 @@
                         <li class="indline1"><tt>Accept-Encoding</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.24"><b>6.3</b></a></li>
                         <li class="indline1"><tt>Accept-Encoding-v</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.25"><b>6.3</b></a></li>
-                        <li class="indline1"><tt>accept-extension</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.21"><b>6.1</b></a></li>
+                        <li class="indline1"><tt>accept-ext</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.21"><b>6.1</b></a></li>
                         <li class="indline1"><tt>Accept-Language</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.27"><b>6.4</b></a></li>
                         <li class="indline1"><tt>Accept-Language-v</tt>&nbsp;&nbsp;<a class="iref" href="#rfc.iref.g.28"><b>6.4</b></a></li>