Changeset 2544

Timestamp:

09/01/14 12:20:42 (8 years ago)

Author:

julian.reschke@…

Message:

move list of special characters from ABNF to prose (see [2520])

Location:

draft-ietf-httpbis/latest

Files:

• httpbis.abnf (modified) (2 diffs)
• p1-messaging.html (modified) (9 diffs)
• p1-messaging.xml (modified) (2 diffs)

draft-ietf-httpbis/latest/httpbis.abnf

@@ -197 +197 @@
 second = 2DIGIT
 segment = <segment, defined in [RFC3986], Section 3.3>
-special = "(" / ")" / "<" / ">" / "@" / "," / ";" / ":" / "\" / DQUOTE / "/" / "[" / "]" / "?" / "=" / "{" / "}"
 start-line = request-line / status-line
 status-code = 3DIGIT
@@ -276 +275 @@
 ; http-URI defined but not used
 ; https-URI defined but not used
-; special defined but not used

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

@@ -448 +448 @@
   }
   @bottom-center {
-       content: "Expires July 12, 2014";
+       content: "Expires July 13, 2014";
   }
   @bottom-right {
@@ -490 +490 @@
       <meta name="dct.creator" content="Reschke, J. F.">
       <meta name="dct.identifier" content="urn:ietf:id:draft-ietf-httpbis-p1-messaging-latest">
-      <meta name="dct.issued" scheme="ISO8601" content="2014-01-08">
+      <meta name="dct.issued" scheme="ISO8601" content="2014-01-09">
       <meta name="dct.replaces" content="urn:ietf:rfc:2145">
       <meta name="dct.replaces" content="urn:ietf:rfc:2616">
@@ -519 +519 @@
             <tr>
                <td class="left">Intended status: Standards Track</td>
-               <td class="right">January 8, 2014</td>
+               <td class="right">January 9, 2014</td>
             </tr>
             <tr>
-               <td class="left">Expires: July 12, 2014</td>
+               <td class="left">Expires: July 13, 2014</td>
                <td class="right"></td>
             </tr>
@@ -551 +551 @@
             in progress”.
          </p>
-         <p>This Internet-Draft will expire on July 12, 2014.</p>
+         <p>This Internet-Draft will expire on July 13, 2014.</p>
       </div>
       <div id="rfc.copyrightnotice">
@@ -1398 +1398 @@
                <h3 id="rfc.section.3.2.6"><a href="#rfc.section.3.2.6">3.2.6</a>&nbsp;<a href="#field.components">Field value components</a></h3>
                <div id="rule.token.separators">
-                  <p id="rfc.section.3.2.6.p.1">   Most HTTP header field values are defined using common syntax components (token, quoted-string, and comment) separated by
+                  <p id="rfc.section.3.2.6.p.1">  <span id="rfc.iref.d.2"></span> Most HTTP header field values are defined using common syntax components (token, quoted-string, and comment) separated by
                      whitespace or specific delimiting characters. Delimiters are chosen from the set of US-ASCII visual characters not allowed
-                     in a token ({VCHAR - tchar}).
+                     in a <a href="#rule.token.separators" class="smpl">token</a> (DQUOTE and "(),/:;&lt;=&gt;?@[\]{}").
                   </p>
                </div>
@@ -1408 +1408 @@
                  / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~" 
                  / <a href="#core.rules" class="smpl">DIGIT</a> / <a href="#core.rules" class="smpl">ALPHA</a>
-                 ; any <a href="#core.rules" class="smpl">VCHAR</a>, except <a href="#rule.token.separators" class="smpl">special</a>
-
-  <a href="#rule.token.separators" class="smpl">special</a>        = "(" / ")" / "&lt;" / "&gt;" / "@" / ","
-                 / ";" / ":" / "\" / DQUOTE / "/" / "[" 
-                 / "]" / "?" / "=" / "{" / "}"
+                 ; any <a href="#core.rules" class="smpl">VCHAR</a>, except delimiters
 </pre><div id="rule.quoted-string">
                   <p id="rfc.section.3.2.6.p.3">   A string of text is parsed as a single value if it is quoted using double-quote marks.</p>
@@ -1762 +1758 @@
             </div>
             <div id="deflate.coding">
-               <div id="rfc.iref.d.2"></div>
+               <div id="rfc.iref.d.3"></div>
                <h3 id="rfc.section.4.2.2"><a href="#rfc.section.4.2.2">4.2.2</a>&nbsp;<a href="#deflate.coding">Deflate Coding</a></h3>
                <p id="rfc.section.4.2.2.p.1">The "deflate" coding is a "zlib" data format <a href="#RFC1950" id="rfc.xref.RFC1950.1"><cite title="ZLIB Compressed Data Format Specification version 3.3">[RFC1950]</cite></a> containing a "deflate" compressed data stream <a href="#RFC1951" id="rfc.xref.RFC1951.1"><cite title="DEFLATE Compressed Data Format Specification version 1.3">[RFC1951]</cite></a> that uses a combination of the Lempel-Ziv (LZ77) compression algorithm and Huffman coding.
@@ -3401 +3397 @@
 
 <a href="#uri" class="smpl">segment</a> = &lt;segment, defined in [RFC3986], Section 3.3&gt;
-<a href="#rule.token.separators" class="smpl">special</a> = "(" / ")" / "&lt;" / "&gt;" / "@" / "," / ";" / ":" / "\" /
- DQUOTE / "/" / "[" / "]" / "?" / "=" / "{" / "}"
 <a href="#http.message" class="smpl">start-line</a> = request-line / status-line
 <a href="#status.line" class="smpl">status-code</a> = 3DIGIT
@@ -3493 +3487 @@
             </li>
             <li><a id="rfc.index.D" href="#rfc.index.D"><b>D</b></a><ul>
-                  <li>deflate (Coding Format)&nbsp;&nbsp;<a href="#rfc.iref.d.2">4.2.2</a></li>
+                  <li>deflate (Coding Format)&nbsp;&nbsp;<a href="#rfc.iref.d.3">4.2.2</a></li>
+                  <li>Delimiters&nbsp;&nbsp;<a href="#rfc.iref.d.2">3.2.6</a></li>
                   <li>downstream&nbsp;&nbsp;<a href="#rfc.iref.d.1"><b>2.3</b></a></li>
                </ul>

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

@@ -1455 +1455 @@
   <x:anchor-alias value="tchar"/>
   <x:anchor-alias value="token"/>
-  <x:anchor-alias value="special"/>
+  <iref item="Delimiters"/>
    Most HTTP header field values are defined using common syntax components
    (token, quoted-string, and comment) separated by whitespace or specific
    delimiting characters. Delimiters are chosen from the set of US-ASCII
-   visual characters not allowed in a token ({VCHAR - tchar}).
+   visual characters not allowed in a <x:ref>token</x:ref>
+   (DQUOTE and "(),/:;&lt;=>?@[\]{}").
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="token"/><iref primary="true" item="Grammar" subitem="tchar"/>
   <x:ref>token</x:ref>          = 1*<x:ref>tchar</x:ref>
 <!--
-  IMPORTANT: when editing "tchar" make sure that "special" is updated accordingly!!!
+  NOTE: the definition of tchar and the prose above about special characters need to match!
  -->
   <x:ref>tchar</x:ref>          = "!" / "#" / "$" / "%" / "&amp;" / "'" / "*"
                  / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~" 
                  / <x:ref>DIGIT</x:ref> / <x:ref>ALPHA</x:ref>
-                 ; any <x:ref>VCHAR</x:ref>, except <x:ref>special</x:ref>
-
-  <x:ref>special</x:ref>        = "(" / ")" / "&lt;" / ">" / "@" / ","
-                 / ";" / ":" / "\" / DQUOTE / "/" / "[" 
-                 / "]" / "?" / "=" / "{" / "}"
+                 ; any <x:ref>VCHAR</x:ref>, except delimiters
 </artwork></figure>
 <t anchor="rule.quoted-string">
@@ -5386 +5383 @@
 
 <x:ref>segment</x:ref> = &lt;segment, defined in [RFC3986], Section 3.3&gt;
-<x:ref>special</x:ref> = "(" / ")" / "&lt;" / "&gt;" / "@" / "," / ";" / ":" / "\" /
- DQUOTE / "/" / "[" / "]" / "?" / "=" / "{" / "}"
 <x:ref>start-line</x:ref> = request-line / status-line
 <x:ref>status-code</x:ref> = 3DIGIT