Start using RFC7405 notation.

For #133
httpwg · Nov 29, 2018 · ea0c045 · ea0c045
1 parent d780a5c
commit ea0c045
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 26 deletions.
diff --git a/draft-ietf-httpbis-cache-latest.xml b/draft-ietf-httpbis-cache-latest.xml
@@ -195,13 +195,17 @@
 <iref primary="true" item="Grammar" subitem="VCHAR"/>
 <t>
    This specification uses the Augmented Backus-Naur Form (ABNF) notation of
-   <xref target="RFC5234"/> with a list extension, defined in
-   <xref target="abnf.extension"/>, that allows for compact definition of
-   comma-separated lists using a '#' operator (similar to how the '*' operator
-   indicates repetition).
-   <xref target="collected.abnf"/> shows the collected grammar with all list
+   <xref target="RFC5234"/>, extended with the notation for case-sensitivity
+   in strings defined in <xref target="RFC7405"/>.
+</t>
+<t>   
+   It also uses a list extension, defined in <xref target="abnf.extension"/>,
+   that allows for compact definition of comma-separated lists using a '#'
+   operator (similar to how the '*' operator indicates repetition). <xref
+   target="collected.abnf"/> shows the collected grammar with all list
    operators expanded to standard ABNF notation.
 </t>
+
 <t anchor="core.rules">
   <x:anchor-alias value="ALPHA"/>
   <x:anchor-alias value="CR"/>
@@ -2040,6 +2044,20 @@
     <seriesInfo name="STD" value="68"/>
     <seriesInfo name="RFC" value="5234"/>
   </reference>
+
+  <reference anchor="RFC7405">
+    <front>
+      <title>Case-Sensitive String Support in ABNF</title>
+      <author initials="P." surname="Kyzivat" fullname="Dave Kyzivat">
+        <organization></organization>
+        <address>
+          <email>pkyzivat@alum.mit.edu</email>
+        </address>  
+      </author>
+      <date month="December" year="2014"/>
+    </front>
+    <seriesInfo name="RFC" value="7405"/>
+  </reference>
 
   <reference anchor="USASCII">
     <front>

diff --git a/draft-ietf-httpbis-messaging-latest.xml b/draft-ietf-httpbis-messaging-latest.xml
@@ -170,11 +170,14 @@
 <iref primary="true" item="Grammar" subitem="VCHAR"/>
 <t>
    This specification uses the Augmented Backus-Naur Form (ABNF) notation of
-   <xref target="RFC5234"/> with a list extension, defined in
-   <xref target="abnf.extension"/>, that allows for compact definition of
-   comma-separated lists using a '#' operator (similar to how the '*' operator
-   indicates repetition).
-   <xref target="collected.abnf"/> shows the collected grammar with all list
+   <xref target="RFC5234"/>, extended with the notation for case-sensitivity
+   in strings defined in <xref target="RFC7405"/>.
+</t>
+<t>   
+   It also uses a list extension, defined in <xref target="abnf.extension"/>,
+   that allows for compact definition of comma-separated lists using a '#'
+   operator (similar to how the '*' operator indicates repetition). <xref
+   target="collected.abnf"/> shows the collected grammar with all list
    operators expanded to standard ABNF notation.
 </t>
 <t>
@@ -1207,9 +1210,9 @@ https://www.example.org
 </t>
 <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" ; <xref target="chunked.encoding"/>
-                     / "compress" ; <xref target="compress.coding"/>
-                     / "deflate" ; <xref target="deflate.coding"/>
-                     / "gzip" ; <xref target="gzip.coding"/>
+                     / %i"compress" ; <xref target="compress.coding"/>
+                     / %i"deflate" ; <xref target="deflate.coding"/>
+                     / %i"gzip" ; <xref target="gzip.coding"/>
                      / <x:ref>transfer-extension</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>transfer-parameter</x:ref> )
 </artwork></figure>
@@ -1513,7 +1516,7 @@ https://www.example.org
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="TE"/><iref primary="true" item="Grammar" subitem="t-codings"/><iref primary="true" item="Grammar" subitem="t-ranking"/><iref primary="true" item="Grammar" subitem="rank"/>
   <x:ref>TE</x:ref>        = #<x:ref>t-codings</x:ref>
   <x:ref>t-codings</x:ref> = "trailers" / ( <x:ref>transfer-coding</x:ref> [ <x:ref>t-ranking</x:ref> ] )
-  <x:ref>t-ranking</x:ref> = <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> "q=" <x:ref>rank</x:ref>
+  <x:ref>t-ranking</x:ref> = <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> %i"q=" <x:ref>rank</x:ref>
   <x:ref>rank</x:ref>      = ( "0" [ "." 0*3<x:ref>DIGIT</x:ref> ] )
              / ( "1" [ "." 0*3("0") ] )
 </artwork></figure>
@@ -2622,6 +2625,20 @@ Upgrade: HTTP/2.0
   <seriesInfo name="RFC" value="5234"/>
 </reference>
 
+<reference anchor="RFC7405">
+  <front>
+    <title>Case-Sensitive String Support in ABNF</title>
+    <author initials="P." surname="Kyzivat" fullname="Dave Kyzivat">
+      <organization></organization>
+      <address>
+        <email>pkyzivat@alum.mit.edu</email>
+      </address>  
+    </author>
+    <date month="December" year="2014"/>
+  </front>
+  <seriesInfo name="RFC" value="7405"/>
+</reference>
+
 <reference anchor="RFC2119">
   <front>
     <title>Key words for use in RFCs to Indicate Requirement Levels</title>

diff --git a/draft-ietf-httpbis-semantics-latest.xml b/draft-ietf-httpbis-semantics-latest.xml
@@ -252,11 +252,14 @@
 <iref primary="true" item="Grammar" subitem="VCHAR"/>
 <t>
    This specification uses the Augmented Backus-Naur Form (ABNF) notation of
-   <xref target="RFC5234"/> with a list extension, defined in
-   <xref target="abnf.extension"/>, that allows for compact definition of
-   comma-separated lists using a '#' operator (similar to how the '*' operator
-   indicates repetition).
-   <xref target="collected.abnf"/> shows the collected grammar with all list
+   <xref target="RFC5234"/>, extended with the notation for case-sensitivity
+   in strings defined in <xref target="RFC7405"/>.
+</t>
+<t>   
+   It also uses a list extension, defined in <xref target="abnf.extension"/>,
+   that allows for compact definition of comma-separated lists using a '#'
+   operator (similar to how the '*' operator indicates repetition). <xref
+   target="collected.abnf"/> shows the collected grammar with all list
    operators expanded to standard ABNF notation.
 </t>
 <t>
@@ -693,7 +696,7 @@ Content-Type: text/plain
    TCP (<xref target="RFC0793"/>) connections on a given port.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="http-URI"><!--terminal production--></iref>
-  <x:ref>http-URI</x:ref> = "http:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
+  <x:ref>http-URI</x:ref> = %i"http:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
 </artwork></figure>
 <t>
    The origin server for an "http" URI is identified by the 
@@ -786,7 +789,7 @@ Content-Type: text/plain
    prior to sending the first HTTP request.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="https-URI"><!--terminal production--></iref>
-  <x:ref>https-URI</x:ref> = "https:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
+  <x:ref>https-URI</x:ref> = %i"https:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
 </artwork></figure>
 <t>
    Note that the "https" URI scheme depends on both TLS and TCP for
@@ -2489,7 +2492,7 @@ Host: www.example.org
    defined for expressing subranges of the data's octet sequence.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="bytes-unit"/>
-  <x:ref>bytes-unit</x:ref>       = "bytes"
+  <x:ref>bytes-unit</x:ref>       = %i"bytes"
 </artwork></figure>
 <t anchor="rule.ranges-specifier">
   <x:anchor-alias value="byte-range-set"/>
@@ -4352,7 +4355,7 @@ Proxy-Authorization: basic aGVsbG86d29ybGQ=
    by this specification is <x:ref>100-continue</x:ref>.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Expect"/>
-  <x:ref>Expect</x:ref>  = "100-continue"
+  <x:ref>Expect</x:ref>  = %i"100-continue"
 </artwork></figure>
 <t>
    The Expect field-value is case-insensitive.
@@ -5177,7 +5180,7 @@ Expect: 100-continue
    the default weight is 1.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="weight"/><iref primary="true" item="Grammar" subitem="qvalue"/>
-  <x:ref>weight</x:ref> = <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> "q=" <x:ref>qvalue</x:ref>
+  <x:ref>weight</x:ref> = <x:ref>OWS</x:ref> ";" <x:ref>OWS</x:ref> %i"q=" <x:ref>qvalue</x:ref>
   <x:ref>qvalue</x:ref> = ( "0" [ "." 0*3<x:ref>DIGIT</x:ref> ] )
          / ( "1" [ "." 0*3("0") ] )
 </artwork></figure>
@@ -5371,7 +5374,7 @@ Expect: 100-continue
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Accept-Encoding"/><iref primary="true" item="Grammar" subitem="codings"/>
   <x:ref>Accept-Encoding</x:ref>  = #( <x:ref>codings</x:ref> [ <x:ref>weight</x:ref> ] )
-  <x:ref>codings</x:ref>          = <x:ref>content-coding</x:ref> / "identity" / "*"
+  <x:ref>codings</x:ref>          = <x:ref>content-coding</x:ref> / %i"identity" / "*"
 </artwork></figure>
 <t>
    Each codings value &MAY; be given an associated quality value
@@ -8844,7 +8847,7 @@ Content-Encoding: gzip
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Accept-Ranges"/><iref primary="true" item="Grammar" subitem="acceptable-ranges"/>
   <x:ref>Accept-Ranges</x:ref>     = <x:ref>acceptable-ranges</x:ref>
-  <x:ref>acceptable-ranges</x:ref> = 1#<x:ref>range-unit</x:ref> / "none"
+  <x:ref>acceptable-ranges</x:ref> = 1#<x:ref>range-unit</x:ref> / %i"none"
 </artwork></figure>
 <t>
    An origin server that supports byte-range requests for a given target
@@ -9812,6 +9815,20 @@ Content-Encoding: gzip
   <seriesInfo name='RFC' value='6365' />
 </reference>
 
+<reference anchor="RFC7405">
+  <front>
+    <title>Case-Sensitive String Support in ABNF</title>
+    <author initials="P." surname="Kyzivat" fullname="Dave Kyzivat">
+      <organization></organization>
+      <address>
+        <email>pkyzivat@alum.mit.edu</email>
+      </address>  
+    </author>
+    <date month="December" year="2014"/>
+  </front>
+  <seriesInfo name="RFC" value="7405"/>
+</reference>
+
 <reference anchor="USASCII">
   <front>
     <title>Coded Character Set -- 7-bit American Standard Code for Information Interchange</title>