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

Timestamp:

02/02/08 13:40:24 (14 years ago)

Author:

julian.reschke@…

Message:

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; addresses #36.

File:

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

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

@@ -1027 +1027 @@
    and <xref target="RFC1808"/>). This specification adopts the
    definitions of "URI-reference", "absoluteURI", "relativeURI", "port",
-   "host", "abs_path", "query", and "authority" from that specification.
-</t>
+   "host", "abs_path", "query", and "authority" from that specification:
+</t>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="absoluteURI"/><iref primary="true" item="Grammar" subitem="authority"/><iref primary="true" item="Grammar" subitem="path-absolute"/><iref primary="true" item="Grammar" subitem="port"/><iref primary="true" item="Grammar" subitem="query"/><iref primary="true" item="Grammar" subitem="relativeURI"/><iref primary="true" item="Grammar" subitem="uri-host"/>
+  absoluteURI   = &lt;absoluteURI, defined in <xref target="RFC2396" x:fmt="," x:sec="3"/>>
+  authority     = &lt;authority, defined in <xref target="RFC2396" x:fmt="," x:sec="3.2"/>>
+  path-absolute = &lt;abs_path, defined in <xref target="RFC2396" x:fmt="," x:sec="3"/>>
+  port          = &lt;port, defined in <xref target="RFC2396" x:fmt="," x:sec="3.2.2"/>>
+  query         = &lt;query, defined in <xref target="RFC2396" x:fmt="," x:sec="3.4"/>>
+  relativeURI   = &lt;relativeURI, defined in <xref target="RFC2396" x:fmt="," x:sec="5"/>>
+  uri-host      = &lt;host, defined in <xref target="RFC2396" x:fmt="," x:sec="3.2.2"/>>
+</artwork></figure>
 <t>
    HTTP does not place any a priori limit on the length of
@@ -1054 +1063 @@
    semantics for http URLs.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="http_URL"/>
-  http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="http-URL"/>
+  http-URL = "http:" "//" uri-host [ ":" port ]
+             [ path-absolute [ "?" query ]]
 </artwork></figure>
 <t>
@@ -1061 +1071 @@
    are that the identified resource is located at the server listening
    for TCP connections on that port of that host, and the Request-URI
-   for the resource is abs_path (<xref target="request-uri"/>). The use of IP addresses
+   for the resource is path-absolute (<xref target="request-uri"/>). The use of IP addresses
    in URLs &SHOULD; be avoided whenever possible (see <xref target="RFC1900"/>). If
-   the abs_path is not present in the URL, it &MUST; be given as "/" when
+   the path-absolute is not present in the URL, it &MUST; be given as "/" when
    used as a Request-URI for a resource (<xref target="request-uri"/>). If a proxy
-
    receives a host name which is not a fully qualified domain name, it
    &MAY; add its domain to the host name it received. If a proxy receives
@@ -1083 +1092 @@
     <t>Comparisons of host names &MUST; be case-insensitive;</t>
     <t>Comparisons of scheme names &MUST; be case-insensitive;</t>
-    <t>An empty abs_path is equivalent to an abs_path of "/".</t>
+    <t>An empty path-absolute is equivalent to an path-absolute of "/".</t>
   </list>
 </t>
@@ -1237 +1246 @@
    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-extension"/><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"/>
+<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-extension"/><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"/>
   Chunked-Body   = *chunk
                    last-chunk
-                   trailer
+                   trailer-part
                    CRLF
   
@@ -1252 +1261 @@
   chunk-ext-val  = token | quoted-string
   chunk-data     = 1*OCTET ; a sequence of chunk-size octets
-  trailer        = *(entity-header CRLF)
+  trailer-part   = *(entity-header CRLF)
 </artwork></figure>
 <t>
@@ -1617 +1626 @@
   Request-URI    = "*"
                  | absoluteURI
-                 | ( abs_path [ "?" query ] )
+                 | ( path-absolute [ "?" query ] )
                  | authority
 </artwork></figure>
@@ -1655 +1664 @@
    The most common form of Request-URI is that used to identify a
    resource on an origin server or gateway. In this case the absolute
-   path of the URI &MUST; be transmitted (see <xref target="general.syntax"/>, abs_path) as
+   path of the URI &MUST; be transmitted (see <xref target="general.syntax"/>, path-absolute) as
    the Request-URI, and the network location of the URI (authority) &MUST;
    be transmitted in a Host header field. For example, a client wishing
@@ -1679 +1688 @@
 </t>
 <t>
-   A transparent proxy &MUST-NOT; rewrite the "abs_path" part of the
+   A transparent proxy &MUST-NOT; rewrite the "path-absolute" part of the
    received Request-URI when forwarding it to the next inbound server,
-   except as noted above to replace a null abs_path with "/".
+   except as noted above to replace a null path-absolute with "/".
 </t>
 <t>
@@ -2400 +2409 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Host"/>
-  Host = "Host" ":" host [ ":" port ] ; <xref target="http.url"/>
+  Host = "Host" ":" uri-host [ ":" port ] ; <xref target="http.url"/>
 </artwork></figure>
 <t>
@@ -2648 +2657 @@
   protocol-name     = token
   protocol-version  = token
-  received-by       = ( host [ ":" port ] ) | pseudonym
+  received-by       = ( uri-host [ ":" port ] ) | pseudonym
   pseudonym         = token
 </artwork></figure>
@@ -4172 +4181 @@
   </list>
 </t>
+<t>
+  Other changes:
+  <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"/>)
+    </t>
+  </list>
+</t>
 </section>