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

Timestamp:

02/02/08 16:29:41 (14 years ago)

Author:

julian.reschke@…

Message:

Synchronize core rules with RFC5234 (except the CHAR vs NUL issue), get rid of prose rules that span multiple lines, get rid of unused rules LOALPHA and UPALPHA; addresses #36.

File:

• draft-ietf-httpbis/latest/p1-messaging.xml (modified) (5 diffs)

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

@@ -811 +811 @@
 <x:anchor-alias value="OCTET"/>
 <x:anchor-alias value="CHAR"/>
-<x:anchor-alias value="UPALPHA"/>
-<x:anchor-alias value="LOALPHA"/>
 <x:anchor-alias value="ALPHA"/>
 <x:anchor-alias value="DIGIT"/>
@@ -836 +834 @@
    is defined by ANSI X3.4-1986 <xref target="USASCII"/>.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="OCTET"/><iref primary="true" item="Grammar" subitem="CHAR"/><iref primary="true" item="Grammar" subitem="UPALPHA"/><iref primary="true" item="Grammar" subitem="LOALPHA"/><iref primary="true" item="Grammar" subitem="ALPHA"/><iref primary="true" item="Grammar" subitem="DIGIT"/><iref primary="true" item="Grammar" subitem="CTL"/><iref primary="true" item="Grammar" subitem="CR"/><iref primary="true" item="Grammar" subitem="LF"/><iref primary="true" item="Grammar" subitem="SP"/><iref primary="true" item="Grammar" subitem="HTAB"/><iref primary="true" item="Grammar" subitem="DQUOTE"/>
-  OCTET          = &lt;any 8-bit sequence of data&gt;
-  CHAR           = &lt;any US-ASCII character (octets 0 - 127)&gt;
-  UPALPHA        = &lt;any US-ASCII uppercase letter "A".."Z"&gt;
-  LOALPHA        = &lt;any US-ASCII lowercase letter "a".."z"&gt;
-  ALPHA          = UPALPHA | LOALPHA
-  DIGIT          = &lt;any US-ASCII digit "0".."9"&gt;
-  CTL            = &lt;any US-ASCII control character
-                   (octets 0 - 31) and DEL (127)&gt;
-  CR             = &lt;US-ASCII CR, carriage return (13)&gt;
-  LF             = &lt;US-ASCII LF, linefeed (10)&gt;
-  SP             = &lt;US-ASCII SP, space (32)&gt;
-  HTAB           = &lt;US-ASCII HT, horizontal-tab (9)&gt;
-  DQUOTE         = &lt;US-ASCII double-quote mark (34)&gt;
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="OCTET"/><iref primary="true" item="Grammar" subitem="CHAR"/><iref primary="true" item="Grammar" subitem="ALPHA"/><iref primary="true" item="Grammar" subitem="DIGIT"/><iref primary="true" item="Grammar" subitem="CTL"/><iref primary="true" item="Grammar" subitem="CR"/><iref primary="true" item="Grammar" subitem="LF"/><iref primary="true" item="Grammar" subitem="SP"/><iref primary="true" item="Grammar" subitem="HTAB"/><iref primary="true" item="Grammar" subitem="DQUOTE"/>
+  OCTET          = %x00-FF
+                   ; any 8-bit sequence of data
+  CHAR           = %x00-7F
+                   ; any US-ASCII character
+  ALPHA          = %x41-5A / %x61-7A
+                   ; A-Z / a-z
+  DIGIT          = %x30-39
+                   ; any US-ASCII digit "0".."9"
+  CTL            = %x00-1F | %x7F
+                   ; (octets 0 - 31) and DEL (127)
+  CR             = %x0D
+                   ; US-ASCII CR, carriage return (13)
+  LF             = %x0A
+                   ; US-ASCII LF, linefeed (10)
+  SP             = %x20
+                   ; US-ASCII SP, space (32)
+  HTAB           = %x09
+                   ; US-ASCII HT, horizontal-tab (9)
+  DQUOTE         = %x22
+                   ; US-ASCII double-quote mark (34)
 </artwork></figure>
 <t>
@@ -878 +883 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="TEXT"/>
-  TEXT           = &lt;any OCTET except CTLs,
-                   but including LWS&gt;
+  TEXT           = &lt;any OCTET except CTLs, but including LWS&gt;
 </artwork></figure>
 <t>
@@ -1387 +1391 @@
   field-name     = token
   field-value    = *( field-content | LWS )
-  field-content  = &lt;the OCTETs making up the field-value
-                   and consisting of either *TEXT or combinations
-                   of token, separators, and quoted-string&gt;
+  field-content  = &lt;field content>
+                   ; the OCTETs making up the field-value
+                   ; and consisting of either *TEXT or combinations
+                   ; of token, separators, and quoted-string
 </artwork></figure>
 <t>
@@ -4182 +4187 @@
 </t>
 <t>
-  Other changes:
+  Ongoing work on ABNF conversion (<eref target="http://www3.tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
   <list style="symbols"> 
     <t>
        Get rid of duplicate BNF rule names ("host" -> "uri-host", "trailer" ->
-       "trailer-part"), avoid underscore character in rule names ("http_URL" ->
-       "http-URL", "abs_path" -> "path-absolute"), add rules for terms
-       imported from URI spec ("absoluteURI", "authority", "path-absolute",
-       "port", "query", "relativeURI", "host) -- these will have to be updated
-       when switching over to RFC3986
-       (work in progress on <eref target="http://www3.tools.ietf.org/wg/httpbis/trac/ticket/36"/>)
+       "trailer-part").
+    </t>
+    <t>
+       Avoid underscore character in rule names ("http_URL" ->
+       "http-URL", "abs_path" -> "path-absolute").
+    </t>
+    <t>
+       Add rules for terms imported from URI spec ("absoluteURI", "authority",
+       "path-absolute", "port", "query", "relativeURI", "host) -- these will
+       have to be updated when switching over to RFC3986. 
+    </t>
+    <t>
+       Synchronize core rules with RFC5234.
+    </t>
+    <t>
+       Get rid of prose rules that span multiple lines.
+    </t>
+    <t>
+       Get rid of unused rules LOALPHA and UPALPHA.
     </t>
   </list>