Changeset 1064 for draft-ietf-httpbis/latest/p2-semantics.xml

Timestamp:

27/10/10 09:52:38 (10 years ago)

Author:

julian.reschke@…

Message:

refer to definition of 'authority form' instead of the ABNF term (see #239)

File:

• draft-ietf-httpbis/latest/p2-semantics.xml (modified) (7 diffs)

draft-ietf-httpbis/latest/p2-semantics.xml

@@ -33 +33 @@
   <!ENTITY use100                     "<xref target='Part1' x:rel='#use.of.the.100.status' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY qvalue                     "<xref target='Part3' x:rel='#quality.values' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY request-target             "<xref target='Part3' x:rel='#request-target' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-accept              "<xref target='Part3' x:rel='#header.accept' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-accept-charset      "<xref target='Part3' x:rel='#header.accept-charset' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -347 +348 @@
 <section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
   <x:anchor-alias value="absolute-URI"/>
-  <x:anchor-alias value="authority"/>
   <x:anchor-alias value="Accept"/>
   <x:anchor-alias value="Accept-Charset"/>
@@ -378 +378 @@
 <figure><!--Part1--><artwork type="abnf2616">
   <x:ref>absolute-URI</x:ref>  = &lt;absolute-URI, defined in &uri;&gt;
-  <x:ref>authority</x:ref>     = &lt;authority, defined in &uri;&gt;
   <x:ref>comment</x:ref>       = &lt;comment, defined in &header-fields;&gt;
   <x:ref>Host</x:ref>          = &lt;Host, defined in &uri;&gt;
@@ -1149 +1148 @@
 </t>
 <t>
-   When using CONNECT, the request-target &MUST; be an authority; i.e.,
-   the host name and port number destination of the requested connection
-   separated by a colon:
-</t>
-
-<figure><artwork type="example">
-    CONNECT server.example.com:80 HTTP/1.1
-    Host: server.example.com:80
+   When using CONNECT, the request-target &MUST; be use the authority form
+   (&request-target;); i.e., the host name and port number destination of the
+   requested connection separated by a colon:
+</t>
+<figure><artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  ">
+CONNECT server.example.com:80 HTTP/1.1
+Host: server.example.com:80
+
 </artwork></figure>
-
 <t>
    Other HTTP mechanisms can be used normally with the CONNECT method --
@@ -1168 +1166 @@
    authority to create a tunnel:
 </t>
-
-<figure><artwork type="example">
-    CONNECT server.example.com:80 HTTP/1.1
-    Host: server.example.com:80
-    Proxy-Authorization: basic aGVsbG86d29ybGQ=
+<figure><artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  ">
+CONNECT server.example.com:80 HTTP/1.1
+Host: server.example.com:80
+Proxy-Authorization: basic aGVsbG86d29ybGQ=
+
 </artwork></figure>
-
 <t>
    Like any other pipelined HTTP/1.1 request, data to be tunnel may be
@@ -3558 +3555 @@
 
 <x:ref>absolute-URI</x:ref> = &lt;absolute-URI, defined in [Part1], Section 2.6&gt;
-authority = &lt;authority, defined in [Part1], Section 2.6&gt;
 
 <x:ref>comment</x:ref> = &lt;comment, defined in [Part1], Section 3.2&gt;
@@ -3594 +3590 @@
 ; Reason-Phrase defined but not used
 ; Status-Code defined but not used
-; authority defined but not used
 ; request-header defined but not used
 ; response-header defined but not used