Changeset 1427

Timestamp:

Sep 1, 2011, 1:45:45 AM (8 years ago)

Author:

julian.reschke@…

Message:

Regen ABNF appendix (see [1425])

Location:

draft-ietf-httpbis/latest

Files:

• p1-messaging.html (modified) (5 diffs)
• p1-messaging.xml (modified) (5 diffs)
• p2-semantics.html (modified) (1 diff)
• p2-semantics.xml (modified) (1 diff)

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

@@ -3145 +3145 @@
 <a href="#method" class="smpl">Method</a> = token
 
-<a href="#rule.whitespace" class="smpl">OWS</a> = *( [ obs-fold ] WSP )
-
-<a href="#rule.whitespace" class="smpl">RWS</a> = 1*( [ obs-fold ] WSP )
-<a href="#status.code.and.reason.phrase" class="smpl">Reason-Phrase</a> = *( WSP / VCHAR / obs-text )
+<a href="#rule.whitespace" class="smpl">OWS</a> = *( SP / HTAB / obs-fold )
+
+<a href="#rule.whitespace" class="smpl">RWS</a> = 1*( SP / HTAB / obs-fold )
+<a href="#status.code.and.reason.phrase" class="smpl">Reason-Phrase</a> = *( HTAB / SP / VCHAR / obs-text )
 <a href="#request" class="smpl">Request</a> = Request-Line *( header-field CRLF ) CRLF [ message-body ]
 <a href="#request-line" class="smpl">Request-Line</a> = Method SP request-target SP HTTP-Version CRLF
@@ -3173 +3173 @@
 <a href="#uri" class="smpl">authority</a> = &lt;authority, defined in [RFC3986], Section 3.2&gt;
 
-<a href="#chunked.encoding" class="smpl">chunk</a> = chunk-size *WSP [ chunk-ext ] CRLF chunk-data CRLF
+<a href="#chunked.encoding" class="smpl">chunk</a> = chunk-size [ chunk-ext ] CRLF chunk-data CRLF
 <a href="#chunked.encoding" class="smpl">chunk-data</a> = 1*OCTET
-<a href="#chunked.encoding" class="smpl">chunk-ext</a> = *( ";" *WSP chunk-ext-name [ "=" chunk-ext-val ] *WSP )
+<a href="#chunked.encoding" class="smpl">chunk-ext</a> = *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
 <a href="#chunked.encoding" class="smpl">chunk-ext-name</a> = token
 <a href="#chunked.encoding" class="smpl">chunk-ext-val</a> = token / quoted-str-nf
@@ -3205 +3205 @@
  / %x53.75.6E.64.61.79 ; Sunday
 
-<a href="#header.fields" class="smpl">field-content</a> = *( WSP / VCHAR / obs-text )
+<a href="#header.fields" class="smpl">field-content</a> = *( HTAB / SP / VCHAR / obs-text )
 <a href="#header.fields" class="smpl">field-name</a> = token
-<a href="#header.fields" class="smpl">field-value</a> = *( field-content / OWS )
-
-<a href="#header.fields" class="smpl">header-field</a> = field-name ":" OWS field-value OWS
+<a href="#header.fields" class="smpl">field-value</a> = *( field-content / obs-fold )
+
+<a href="#header.fields" class="smpl">header-field</a> = field-name ":" OWS field-value BWS
 <a href="#preferred.date.format" class="smpl">hour</a> = 2DIGIT
 <a href="#http.uri" class="smpl">http-URI</a> = "http://" authority path-abempty [ "?" query ]
 <a href="#https.uri" class="smpl">https-URI</a> = "https://" authority path-abempty [ "?" query ]
 
-<a href="#chunked.encoding" class="smpl">last-chunk</a> = 1*"0" *WSP [ chunk-ext ] CRLF
+<a href="#chunked.encoding" class="smpl">last-chunk</a> = 1*"0" [ chunk-ext ] CRLF
 
 <a href="#message.body" class="smpl">message-body</a> = *OCTET
@@ -3232 +3232 @@
 
 <a href="#obsolete.date.formats" class="smpl">obs-date</a> = rfc850-date / asctime-date
-<a href="#rule.whitespace" class="smpl">obs-fold</a> = CRLF
+<a href="#rule.whitespace" class="smpl">obs-fold</a> = CRLF ( SP / HTAB )
 <a href="#rule.quoted-string" class="smpl">obs-text</a> = %x80-FF
 
@@ -3248 +3248 @@
  / %x5D-7E ; ']'-'~'
  / obs-text
-<a href="#chunked.encoding" class="smpl">qdtext-nf</a> = WSP / "!" / %x23-5B ; '#'-'['
+<a href="#chunked.encoding" class="smpl">qdtext-nf</a> = HTAB / SP / "!" / %x23-5B ; '#'-'['
  / %x5D-7E ; ']'-'~'
  / obs-text
 <a href="#uri" class="smpl">query</a> = &lt;query, defined in [RFC3986], Section 3.4&gt;
-<a href="#rule.quoted-cpair" class="smpl">quoted-cpair</a> = "\" ( WSP / VCHAR / obs-text )
-<a href="#rule.quoted-pair" class="smpl">quoted-pair</a> = "\" ( WSP / VCHAR / obs-text )
+<a href="#rule.quoted-cpair" class="smpl">quoted-cpair</a> = "\" ( HTAB / SP / VCHAR / obs-text )
+<a href="#rule.quoted-pair" class="smpl">quoted-pair</a> = "\" ( HTAB / SP / VCHAR / obs-text )
 <a href="#chunked.encoding" class="smpl">quoted-str-nf</a> = DQUOTE *( qdtext-nf / quoted-pair ) DQUOTE
 <a href="#rule.quoted-string" class="smpl">quoted-string</a> = DQUOTE *( qdtext / quoted-pair ) DQUOTE

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

@@ -5306 +5306 @@
 <x:ref>Method</x:ref> = token
 
-<x:ref>OWS</x:ref> = *( [ obs-fold ] WSP )
-
-<x:ref>RWS</x:ref> = 1*( [ obs-fold ] WSP )
-<x:ref>Reason-Phrase</x:ref> = *( WSP / VCHAR / obs-text )
+<x:ref>OWS</x:ref> = *( SP / HTAB / obs-fold )
+
+<x:ref>RWS</x:ref> = 1*( SP / HTAB / obs-fold )
+<x:ref>Reason-Phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>Request</x:ref> = Request-Line *( header-field CRLF ) CRLF [ message-body ]
 <x:ref>Request-Line</x:ref> = Method SP request-target SP HTTP-Version CRLF
@@ -5334 +5334 @@
 <x:ref>authority</x:ref> = &lt;authority, defined in [RFC3986], Section 3.2&gt;
 
-<x:ref>chunk</x:ref> = chunk-size *WSP [ chunk-ext ] CRLF chunk-data CRLF
+<x:ref>chunk</x:ref> = chunk-size [ chunk-ext ] CRLF chunk-data CRLF
 <x:ref>chunk-data</x:ref> = 1*OCTET
-<x:ref>chunk-ext</x:ref> = *( ";" *WSP chunk-ext-name [ "=" chunk-ext-val ] *WSP )
+<x:ref>chunk-ext</x:ref> = *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
 <x:ref>chunk-ext-name</x:ref> = token
 <x:ref>chunk-ext-val</x:ref> = token / quoted-str-nf
@@ -5366 +5366 @@
  / %x53.75.6E.64.61.79 ; Sunday
 
-<x:ref>field-content</x:ref> = *( WSP / VCHAR / obs-text )
+<x:ref>field-content</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>field-name</x:ref> = token
-<x:ref>field-value</x:ref> = *( field-content / OWS )
-
-<x:ref>header-field</x:ref> = field-name ":" OWS field-value OWS
+<x:ref>field-value</x:ref> = *( field-content / obs-fold )
+
+<x:ref>header-field</x:ref> = field-name ":" OWS field-value BWS
 <x:ref>hour</x:ref> = 2DIGIT
 <x:ref>http-URI</x:ref> = "http://" authority path-abempty [ "?" query ]
 <x:ref>https-URI</x:ref> = "https://" authority path-abempty [ "?" query ]
 
-<x:ref>last-chunk</x:ref> = 1*"0" *WSP [ chunk-ext ] CRLF
+<x:ref>last-chunk</x:ref> = 1*"0" [ chunk-ext ] CRLF
 
 <x:ref>message-body</x:ref> = *OCTET
@@ -5393 +5393 @@
 
 <x:ref>obs-date</x:ref> = rfc850-date / asctime-date
-<x:ref>obs-fold</x:ref> = CRLF
+<x:ref>obs-fold</x:ref> = CRLF ( SP / HTAB )
 <x:ref>obs-text</x:ref> = %x80-FF
 
@@ -5409 +5409 @@
  / %x5D-7E ; ']'-'~'
  / obs-text
-<x:ref>qdtext-nf</x:ref> = WSP / "!" / %x23-5B ; '#'-'['
+<x:ref>qdtext-nf</x:ref> = HTAB / SP / "!" / %x23-5B ; '#'-'['
  / %x5D-7E ; ']'-'~'
  / obs-text
 <x:ref>query</x:ref> = &lt;query, defined in [RFC3986], Section 3.4&gt;
-<x:ref>quoted-cpair</x:ref> = "\" ( WSP / VCHAR / obs-text )
-<x:ref>quoted-pair</x:ref> = "\" ( WSP / VCHAR / obs-text )
+<x:ref>quoted-cpair</x:ref> = "\" ( HTAB / SP / VCHAR / obs-text )
+<x:ref>quoted-pair</x:ref> = "\" ( HTAB / SP / VCHAR / obs-text )
 <x:ref>quoted-str-nf</x:ref> = DQUOTE *( qdtext-nf / quoted-pair ) DQUOTE
 <x:ref>quoted-string</x:ref> = DQUOTE *( qdtext / quoted-pair ) DQUOTE

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

@@ -2810 +2810 @@
 
 <a href="#core.rules" class="smpl">RWS</a> = &lt;RWS, defined in [Part1], Section 1.2.2&gt;
-<a href="#status.code.and.reason.phrase" class="smpl">Reason-Phrase</a> = *( WSP / VCHAR / obs-text )
+<a href="#status.code.and.reason.phrase" class="smpl">Reason-Phrase</a> = *( HTAB / SP / VCHAR / obs-text )
 <a href="#header.referer" class="smpl">Referer</a> = absolute-URI / partial-URI
 <a href="#header.retry-after" class="smpl">Retry-After</a> = HTTP-date / delta-seconds

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

@@ -3692 +3692 @@
 
 <x:ref>RWS</x:ref> = &lt;RWS, defined in [Part1], Section 1.2.2&gt;
-<x:ref>Reason-Phrase</x:ref> = *( WSP / VCHAR / obs-text )
+<x:ref>Reason-Phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>Referer</x:ref> = absolute-URI / partial-URI
 <x:ref>Retry-After</x:ref> = HTTP-date / delta-seconds