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

Timestamp:

03/03/12 23:56:54 (9 years ago)

Author:

fielding@…

Message:

(editorial) Consistently use lowercase for ABNF rule names other than header fields

File:

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

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

@@ -702 +702 @@
 
 <section title="Protocol Versioning" anchor="http.version">
-  <x:anchor-alias value="HTTP-Version"/>
-  <x:anchor-alias value="HTTP-Prot-Name"/>
+  <x:anchor-alias value="HTTP-version"/>
+  <x:anchor-alias value="HTTP-name"/>
 <t>
    HTTP uses a "&lt;major&gt;.&lt;minor&gt;" numbering scheme to indicate
@@ -712 +712 @@
 </t>
 <t>
-   The version of an HTTP message is indicated by an HTTP-Version field
-   in the first line of the message. HTTP-Version is case-sensitive.
-</t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HTTP-Version"/><iref primary="true" item="Grammar" subitem="HTTP-Prot-Name"/>
-  <x:ref>HTTP-Version</x:ref>   = <x:ref>HTTP-Prot-Name</x:ref> "/" <x:ref>DIGIT</x:ref> "." <x:ref>DIGIT</x:ref>
-  <x:ref>HTTP-Prot-Name</x:ref> = <x:abnf-char-sequence>"HTTP"</x:abnf-char-sequence> ; "HTTP", case-sensitive 
+   The version of an HTTP message is indicated by an HTTP-version field
+   in the first line of the message. HTTP-version is case-sensitive.
+</t>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HTTP-version"/><iref primary="true" item="Grammar" subitem="HTTP-name"/>
+  <x:ref>HTTP-version</x:ref>   = <x:ref>HTTP-name</x:ref> "/" <x:ref>DIGIT</x:ref> "." <x:ref>DIGIT</x:ref>
+  <x:ref>HTTP-name</x:ref> = <x:abnf-char-sequence>"HTTP"</x:abnf-char-sequence> ; "HTTP", case-sensitive 
 </artwork></figure>
 <t>
@@ -764 +764 @@
 <t>
    Intermediaries that process HTTP messages (i.e., all intermediaries
-   other than those acting as tunnels) &MUST; send their own HTTP-Version
+   other than those acting as tunnels) &MUST; send their own HTTP-version
    in forwarded messages.  In other words, they &MUST-NOT; blindly
    forward the first line of an HTTP message without ensuring that the
@@ -770 +770 @@
    intermediary is conformant for both the receiving and
    sending of messages.  Forwarding an HTTP message without rewriting
-   the HTTP-Version might result in communication errors when downstream
+   the HTTP-version might result in communication errors when downstream
    recipients use the message sender's version to determine what features
    are safe to use for later communication with that sender.
@@ -803 +803 @@
    version responses, such as when a client fails to parse the version
    number correctly or when an intermediary is known to blindly forward
-   the HTTP-Version even when it doesn't conform to the given minor
+   the HTTP-version even when it doesn't conform to the given minor
    version of the protocol. Such protocol downgrades &SHOULD-NOT; be
    performed unless triggered by specific client attributes, such as when
@@ -1083 +1083 @@
    An HTTP message can either be a request from client to server or a
    response from server to client.  Syntactically, the two types of message
-   differ only in the start-line, which is either a Request-Line (for requests)
-   or a Status-Line (for responses), and in the algorithm for determining
+   differ only in the start-line, which is either a request-line (for requests)
+   or a status-line (for responses), and in the algorithm for determining
    the length of the message body (<xref target="message.body"/>).
    In theory, a client could receive requests and a server could receive
@@ -1093 +1093 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="start-line"/>
-  <x:ref>start-line</x:ref>      = <x:ref>Request-Line</x:ref> / <x:ref>Status-Line</x:ref>
+  <x:ref>start-line</x:ref>      = <x:ref>request-line</x:ref> / <x:ref>status-line</x:ref>
 </artwork></figure>
 <t>
@@ -1108 +1108 @@
 </t>
 
-<section title="Request-Line" anchor="request.line">
+<section title="Request Line" anchor="request.line">
   <x:anchor-alias value="Request"/>
-  <x:anchor-alias value="Request-Line"/>
-<t>
-   The Request-Line begins with a method token, followed by a single
+  <x:anchor-alias value="request-line"/>
+<t>
+   A request-line begins with a method token, followed by a single
    space (SP), the request-target, another single space (SP), the
    protocol version, and ending with CRLF.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Request-Line"/>
-  <x:ref>Request-Line</x:ref>   = <x:ref>Method</x:ref> <x:ref>SP</x:ref> <x:ref>request-target</x:ref> <x:ref>SP</x:ref> <x:ref>HTTP-Version</x:ref> <x:ref>CRLF</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="request-line"/>
+  <x:ref>request-line</x:ref>   = <x:ref>method</x:ref> <x:ref>SP</x:ref> <x:ref>request-target</x:ref> <x:ref>SP</x:ref> <x:ref>HTTP-version</x:ref> <x:ref>CRLF</x:ref>
 </artwork></figure>
 
 <section title="Method" anchor="method">
-  <x:anchor-alias value="Method"/>
-<t>
-   The Method token indicates the request method to be performed on the
+  <x:anchor-alias value="method"/>
+<t>
+   The method token indicates the request method to be performed on the
    target resource. The request method is case-sensitive.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Method"/>
-  <x:ref>Method</x:ref>         = <x:ref>token</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="method"/>
+  <x:ref>method</x:ref>         = <x:ref>token</x:ref>
 </artwork></figure>
 <t>
-   See &method; for further information, such as the list of methods defined
-   by this specification, the IANA registry, and considerations for new methods.
+   The methods defined by this specification can be found in
+   &method;, along with information regarding the HTTP method registry
+   and considerations for defining new methods.
 </t>
 </section>
@@ -1170 +1171 @@
 </section>
 
-<section title="Response Status-Line" anchor="status.line">
-  <x:anchor-alias value="Response"/>
-  <x:anchor-alias value="Status-Line"/>
-<t>
-   The first line of a Response message is the Status-Line, consisting
+<section title="Response Status Line" anchor="status.line">
+  <x:anchor-alias value="response"/>
+  <x:anchor-alias value="status-line"/>
+<t>
+   The first line of a response message is the status-line, consisting
    of the protocol version, a space (SP), the status code, another space,
    a possibly-empty textual phrase describing the status code, and
    ending with CRLF.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Status-Line"/>
-  <x:ref>Status-Line</x:ref> = <x:ref>HTTP-Version</x:ref> <x:ref>SP</x:ref> <x:ref>Status-Code</x:ref> <x:ref>SP</x:ref> <x:ref>Reason-Phrase</x:ref> <x:ref>CRLF</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="status-line"/>
+  <x:ref>status-line</x:ref> = <x:ref>HTTP-version</x:ref> <x:ref>SP</x:ref> <x:ref>status-code</x:ref> <x:ref>SP</x:ref> <x:ref>reason-phrase</x:ref> <x:ref>CRLF</x:ref>
 </artwork></figure>
 
 <section title="Status Code" anchor="status.code">
-  <x:anchor-alias value="Status-Code"/>
-<t>
-   The Status-Code element is a 3-digit integer result code of the attempt to
+  <x:anchor-alias value="status-code"/>
+<t>
+   The status-code element is a 3-digit integer result code of the attempt to
    understand and satisfy the request. See &status-code-reasonphr; for
    further information, such as the list of status codes defined by this
    specification, the IANA registry, and considerations for new status codes.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Status-Code"/>
-  <x:ref>Status-Code</x:ref>    = 3<x:ref>DIGIT</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="status-code"/>
+  <x:ref>status-code</x:ref>    = 3<x:ref>DIGIT</x:ref>
 </artwork></figure>
 </section>
 
 <section title="Reason Phrase" anchor="reason.phrase">
-  <x:anchor-alias value="Reason-Phrase"/>
+  <x:anchor-alias value="reason-phrase"/>
 <t>   
    The Reason Phrase exists for the sole purpose of providing a textual
@@ -1205 +1206 @@
    Phrase.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Reason-Phrase"/>
-  <x:ref>Reason-Phrase</x:ref>  = *( <x:ref>HTAB</x:ref> / <x:ref>SP</x:ref> / <x:ref>VCHAR</x:ref> / <x:ref>obs-text</x:ref> )
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="reason-phrase"/>
+  <x:ref>reason-phrase</x:ref>  = *( <x:ref>HTAB</x:ref> / <x:ref>SP</x:ref> / <x:ref>VCHAR</x:ref> / <x:ref>obs-text</x:ref> )
 </artwork></figure>
 </section>
@@ -1893 +1894 @@
 <t>
    In the interest of robustness, servers &SHOULD; ignore at least one
-   empty line received where a Request-Line is expected. In other words, if
+   empty line received where a request-line is expected. In other words, if
    the server is reading the protocol stream at the beginning of a
    message and receives a CRLF first, it &SHOULD; ignore the CRLF.
@@ -1968 +1969 @@
    proxies &MUST; be able to recognize and exclude all of its own server
    names, including any aliases, local variations, or literal IP addresses.
-   An example Request-Line would be:
+   An example request-line would be:
 </t>
 <figure><artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  ">
@@ -2101 +2102 @@
     </t>
     <t>
-      the request-target obtained from the Request-Line, unless the
+      the request-target obtained from the request-line, unless the
       request-target is just the asterisk "*".
     </t>
@@ -2210 +2211 @@
   <iref item="Coding Format" subitem="chunked"/>
   <x:anchor-alias value="chunk"/>
-  <x:anchor-alias value="Chunked-Body"/>
+  <x:anchor-alias value="chunked-body"/>
   <x:anchor-alias value="chunk-data"/>
   <x:anchor-alias value="chunk-ext"/>
@@ -2228 +2229 @@
    received the full message.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Chunked-Body"/><iref primary="true" item="Grammar" subitem="chunk"/><iref primary="true" item="Grammar" subitem="chunk-size"/><iref primary="true" item="Grammar" subitem="last-chunk"/><iref primary="true" item="Grammar" subitem="chunk-ext"/><iref primary="true" item="Grammar" subitem="chunk-ext-name"/><iref primary="true" item="Grammar" subitem="chunk-ext-val"/><iref primary="true" item="Grammar" subitem="chunk-data"/><iref primary="true" item="Grammar" subitem="trailer-part"/><iref primary="true" item="Grammar" subitem="quoted-str-nf"/><iref primary="true" item="Grammar" subitem="qdtext-nf"/>
-  <x:ref>Chunked-Body</x:ref>   = *<x:ref>chunk</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="chunked-body"/><iref primary="true" item="Grammar" subitem="chunk"/><iref primary="true" item="Grammar" subitem="chunk-size"/><iref primary="true" item="Grammar" subitem="last-chunk"/><iref primary="true" item="Grammar" subitem="chunk-ext"/><iref primary="true" item="Grammar" subitem="chunk-ext-name"/><iref primary="true" item="Grammar" subitem="chunk-ext-val"/><iref primary="true" item="Grammar" subitem="chunk-data"/><iref primary="true" item="Grammar" subitem="trailer-part"/><iref primary="true" item="Grammar" subitem="quoted-str-nf"/><iref primary="true" item="Grammar" subitem="qdtext-nf"/>
+  <x:ref>chunked-body</x:ref>   = *<x:ref>chunk</x:ref>
                    <x:ref>last-chunk</x:ref>
                    <x:ref>trailer-part</x:ref>
@@ -3178 +3179 @@
    for multiple host names on a single IP address.  Since the Host
    field-value is critical information for handling a request, it
-   &SHOULD; be sent as the first header field following the Request-Line.
+   &SHOULD; be sent as the first header field following the request-line.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Host"/>
@@ -3571 +3572 @@
       <list style="hanging">
         <t hangText="version:">
-          The HTTP-Version number of the enclosed message
+          The HTTP-version number of the enclosed message
           (e.g., "1.1"). If not present, the version can be
           determined from the first line of the body.
@@ -3640 +3641 @@
       <list style="hanging">
         <t hangText="version:">
-          The HTTP-Version number of the enclosed messages
+          The HTTP-version number of the enclosed messages
           (e.g., "1.1"). If not present, the version can be
           determined from the first line of the body.
@@ -4967 +4968 @@
 </t>
 <t>
-  Clarify that the string "HTTP" in the HTTP-Version ABFN production is case
+  Clarify that the string "HTTP" in the HTTP-version ABFN production is case
   sensitive. Restrict the version numbers to be single digits due to the fact
   that implementations are known to handle multi-digit version numbers
@@ -5039 +5040 @@
 <x:ref>BWS</x:ref> = OWS
 
-<x:ref>Chunked-Body</x:ref> = *chunk last-chunk trailer-part CRLF
 <x:ref>Connection</x:ref> = *( "," OWS ) connection-token *( OWS "," [ OWS
  connection-token ] )
 <x:ref>Content-Length</x:ref> = 1*DIGIT
 
-<x:ref>HTTP-Prot-Name</x:ref> = %x48.54.54.50 ; HTTP
-<x:ref>HTTP-Version</x:ref> = HTTP-Prot-Name "/" DIGIT "." DIGIT
 <x:ref>HTTP-message</x:ref> = start-line *( header-field CRLF ) CRLF [ message-body
  ]
+<x:ref>HTTP-name</x:ref> = %x48.54.54.50 ; HTTP
+<x:ref>HTTP-version</x:ref> = HTTP-name "/" DIGIT "." DIGIT
 <x:ref>Host</x:ref> = uri-host [ ":" port ]
 
-<x:ref>Method</x:ref> = token
-
 <x:ref>OWS</x:ref> = *( SP / HTAB )
 
 <x:ref>RWS</x:ref> = 1*( SP / HTAB )
-<x:ref>Reason-Phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
-<x:ref>Request-Line</x:ref> = Method SP request-target SP HTTP-Version CRLF
-
-<x:ref>Status-Code</x:ref> = 3DIGIT
-<x:ref>Status-Line</x:ref> = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
 
 <x:ref>TE</x:ref> = [ ( "," / t-codings ) *( OWS "," [ OWS t-codings ] ) ]
@@ -5083 +5076 @@
 <x:ref>chunk-ext-val</x:ref> = token / quoted-str-nf
 <x:ref>chunk-size</x:ref> = 1*HEXDIG
+<x:ref>chunked-body</x:ref> = *chunk last-chunk trailer-part CRLF
 <x:ref>comment</x:ref> = "(" *( ctext / quoted-cpair / comment ) ")"
 <x:ref>connection-token</x:ref> = token
@@ -5101 +5095 @@
 
 <x:ref>message-body</x:ref> = *OCTET
+<x:ref>method</x:ref> = token
 
 <x:ref>obs-fold</x:ref> = CRLF ( SP / HTAB )
@@ -5127 +5122 @@
 <x:ref>qvalue</x:ref> = ( "0" [ "." *3DIGIT ] ) / ( "1" [ "." *3"0" ] )
 
+<x:ref>reason-phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>received-by</x:ref> = ( uri-host [ ":" port ] ) / pseudonym
 <x:ref>received-protocol</x:ref> = [ protocol-name "/" ] protocol-version
 <x:ref>relative-part</x:ref> = &lt;relative-part, defined in [RFC3986], Section 4.2&gt;
+<x:ref>request-line</x:ref> = method SP request-target SP HTTP-version CRLF
 <x:ref>request-target</x:ref> = "*" / absolute-URI / ( path-absolute [ "?" query ] )
  / authority
@@ -5135 +5132 @@
 <x:ref>special</x:ref> = "(" / ")" / "&lt;" / "&gt;" / "@" / "," / ";" / ":" / "\" /
  DQUOTE / "/" / "[" / "]" / "?" / "=" / "{" / "}"
-<x:ref>start-line</x:ref> = Request-Line / Status-Line
+<x:ref>start-line</x:ref> = request-line / status-line
+<x:ref>status-code</x:ref> = 3DIGIT
+<x:ref>status-line</x:ref> = HTTP-version SP status-code SP reason-phrase CRLF
 
 <x:ref>t-codings</x:ref> = "trailers" / ( transfer-extension [ te-params ] )
@@ -5157 +5156 @@
 </figure>
 <figure><preamble>ABNF diagnostics:</preamble><artwork type="inline">
-; Chunked-Body defined but not used
 ; Connection defined but not used
 ; Content-Length defined but not used
@@ -5168 +5166 @@
 ; Upgrade defined but not used
 ; Via defined but not used
+; chunked-body defined but not used
 ; http-URI defined but not used
 ; https-URI defined but not used
@@ -5376 +5375 @@
   <list style="symbols"> 
     <t>
-      Replace string literals when the string really is case-sensitive (HTTP-Version).
+      Replace string literals when the string really is case-sensitive (HTTP-version).
     </t>
   </list>
@@ -5493 +5492 @@
     <t>
       <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/94"/>:
-      "Reason-Phrase BNF"
+      "reason-phrase BNF"
     </t>
     <t>
@@ -5824 +5823 @@
     <t>
       <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/273"/>:
-      "HTTP-Version should be redefined as fixed length pair of DIGIT . DIGIT"
+      "HTTP-version should be redefined as fixed length pair of DIGIT . DIGIT"
     </t>
     <t>