Changeset 366 for draft-ietf-httpbis/latest/p1-messaging.xml

Timestamp:

13/11/08 18:53:12 (13 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/p1-messaging.xml (modified) (11 diffs)

draft-ietf-httpbis/latest/p1-messaging.xml

@@ -954 +954 @@
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="transfer-coding"/><iref primary="true" item="Grammar" subitem="transfer-extension"/>
   <x:ref>transfer-coding</x:ref>         = "chunked" / <x:ref>transfer-extension</x:ref>
-  <x:ref>transfer-extension</x:ref>      = <x:ref>token</x:ref> *( OWS ";" OWS <x:ref>parameter</x:ref> )
+  <x:ref>transfer-extension</x:ref>      = <x:ref>token</x:ref> *( <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> <x:ref>parameter</x:ref> )
 </artwork></figure>
 <t anchor="rule.parameter">
@@ -963 +963 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="parameter"/><iref primary="true" item="Grammar" subitem="attribute"/><iref primary="true" item="Grammar" subitem="value"/>
-  <x:ref>parameter</x:ref>               = <x:ref>attribute</x:ref> BWS "=" BWS <x:ref>value</x:ref>
+  <x:ref>parameter</x:ref>               = <x:ref>attribute</x:ref> <x:ref>BWS</x:ref> "=" <x:ref>BWS</x:ref> <x:ref>value</x:ref>
   <x:ref>attribute</x:ref>               = <x:ref>token</x:ref>
   <x:ref>value</x:ref>                   = <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref>
@@ -2084 +2084 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Connection"/><iref primary="true" item="Grammar" subitem="Connection-v"/><iref primary="true" item="Grammar" subitem="connection-token"/>
-  <x:ref>Connection</x:ref>       = "Connection" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Connection-v</x:ref>
+  <x:ref>Connection</x:ref>       = "Connection" ":" <x:ref>OWS</x:ref> <x:ref>Connection-v</x:ref>
   <x:ref>Connection-v</x:ref>     = 1#<x:ref>connection-token</x:ref>
   <x:ref>connection-token</x:ref> = <x:ref>token</x:ref>
@@ -2145 +2145 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Content-Length"/><iref primary="true" item="Grammar" subitem="Content-Length-v"/>
-  <x:ref>Content-Length</x:ref>   = "Content-Length" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> 1*<x:ref>Content-Length-v</x:ref>
+  <x:ref>Content-Length</x:ref>   = "Content-Length" ":" <x:ref>OWS</x:ref> 1*<x:ref>Content-Length-v</x:ref>
   <x:ref>Content-Length-v</x:ref> = 1*<x:ref>DIGIT</x:ref>
 </artwork></figure>
@@ -2186 +2186 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Date"/><iref primary="true" item="Grammar" subitem="Date-v"/>
-  <x:ref>Date</x:ref>   = "Date" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Date-v</x:ref>
+  <x:ref>Date</x:ref>   = "Date" ":" <x:ref>OWS</x:ref> <x:ref>Date-v</x:ref>
   <x:ref>Date-v</x:ref> = <x:ref>HTTP-date</x:ref>
 </artwork></figure>
@@ -2269 +2269 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Host"/><iref primary="true" item="Grammar" subitem="Host-v"/>
-  <x:ref>Host</x:ref>   = "Host" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Host-v</x:ref>
+  <x:ref>Host</x:ref>   = "Host" ":" <x:ref>OWS</x:ref> <x:ref>Host-v</x:ref>
   <x:ref>Host-v</x:ref> = <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ; <xref target="http.url"/>
 </artwork></figure>
@@ -2315 +2315 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="TE"/><iref primary="true" item="Grammar" subitem="TE-v"/><iref primary="true" item="Grammar" subitem="t-codings"/>
-  <x:ref>TE</x:ref>        = "TE" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>TE-v</x:ref>
+  <x:ref>TE</x:ref>        = "TE" ":" <x:ref>OWS</x:ref> <x:ref>TE-v</x:ref>
   <x:ref>TE-v</x:ref>      = #<x:ref>t-codings</x:ref>
   <x:ref>t-codings</x:ref> = "trailers" / ( <x:ref>transfer-extension</x:ref> [ <x:ref>accept-params</x:ref> ] )
@@ -2389 +2389 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Trailer"/><iref primary="true" item="Grammar" subitem="Trailer-v"/>
-  <x:ref>Trailer</x:ref>   = "Trailer" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Trailer-v</x:ref>
+  <x:ref>Trailer</x:ref>   = "Trailer" ":" <x:ref>OWS</x:ref> <x:ref>Trailer-v</x:ref>
   <x:ref>Trailer-v</x:ref> = 1#<x:ref>field-name</x:ref>
 </artwork></figure>
@@ -2427 +2427 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Transfer-Encoding"/><iref primary="true" item="Grammar" subitem="Transfer-Encoding-v"/>
-  <x:ref>Transfer-Encoding</x:ref>   = "Transfer-Encoding" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Transfer-Encoding-v</x:ref>
+  <x:ref>Transfer-Encoding</x:ref>   = "Transfer-Encoding" ":" <x:ref>OWS</x:ref> <x:ref>Transfer-Encoding-v</x:ref>
   <x:ref>Transfer-Encoding-v</x:ref> = 1#<x:ref>transfer-coding</x:ref>
 </artwork></figure>
@@ -2461 +2461 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Upgrade"/><iref primary="true" item="Grammar" subitem="Upgrade-v"/>
-  <x:ref>Upgrade</x:ref>   = "Upgrade" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Upgrade-v</x:ref>
+  <x:ref>Upgrade</x:ref>   = "Upgrade" ":" <x:ref>OWS</x:ref> <x:ref>Upgrade-v</x:ref>
   <x:ref>Upgrade-v</x:ref> = 1#<x:ref>product</x:ref>
 </artwork></figure>
@@ -2534 +2534 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Via"/><iref primary="true" item="Grammar" subitem="Via-v"/><iref primary="true" item="Grammar" subitem="received-protocol"/><iref primary="true" item="Grammar" subitem="protocol-name"/><iref primary="true" item="Grammar" subitem="protocol-version"/><iref primary="true" item="Grammar" subitem="received-by"/><iref primary="true" item="Grammar" subitem="pseudonym"/>
-  <x:ref>Via</x:ref>               = "Via" <x:ref>BWS</x:ref> ":" <x:ref>OWS</x:ref> <x:ref>Via-v</x:ref>
+  <x:ref>Via</x:ref>               = "Via" ":" <x:ref>OWS</x:ref> <x:ref>Via-v</x:ref>
   <x:ref>Via-v</x:ref>             = 1#( <x:ref>received-protocol</x:ref> <x:ref>RWS</x:ref> <x:ref>received-by</x:ref> [ <x:ref>RWS</x:ref> <x:ref>comment</x:ref> ] )
   <x:ref>received-protocol</x:ref> = [ <x:ref>protocol-name</x:ref> "/" ] <x:ref>protocol-version</x:ref>