Changeset 1705

Timestamp:

Jul 3, 2012, 12:48:00 AM (7 years ago)

Author:

julian.reschke@…

Message:

Avoid use of "connection-token" outside the header field definition; use "connection option" instead; consistently quote the "close" connection option.

Location:

draft-ietf-httpbis/latest

Files:

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

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

@@ -2103 +2103 @@
       </p>
       <h4 id="rfc.section.6.3.2.1"><a href="#rfc.section.6.3.2.1">6.3.2.1</a>&nbsp;<a id="persistent.negotiation" href="#persistent.negotiation">Negotiation</a></h4>
-      <p id="rfc.section.6.3.2.1.p.1">An HTTP/1.1 server <em class="bcp14">MAY</em> assume that a HTTP/1.1 client intends to maintain a persistent connection unless a Connection header field including the connection-token
-         "close" was sent in the request. If the server chooses to close the connection immediately after sending the response, it <em class="bcp14">SHOULD</em> send a Connection header field including the connection-token "close".
+      <p id="rfc.section.6.3.2.1.p.1">An HTTP/1.1 server <em class="bcp14">MAY</em> assume that a HTTP/1.1 client intends to maintain a persistent connection unless a Connection header field including the connection
+         option "close" was sent in the request. If the server chooses to close the connection immediately after sending the response,
+         it <em class="bcp14">SHOULD</em> send a Connection header field including the connection option "close".
       </p>
       <p id="rfc.section.6.3.2.1.p.2">An HTTP/1.1 client <em class="bcp14">MAY</em> expect a connection to remain open, but would decide to keep it open based on whether the response from a server contains
-         a Connection header field with the connection-token close. In case the client does not want to maintain a connection for more
-         than that request, it <em class="bcp14">SHOULD</em> send a Connection header field including the connection-token close.
-      </p>
-      <p id="rfc.section.6.3.2.1.p.3">If either the client or the server sends the close token in the Connection header field, that request becomes the last one
-         for the connection.
+         a Connection header field with the connection option "close". In case the client does not want to maintain a connection for
+         more than that request, it <em class="bcp14">SHOULD</em> send a Connection header field including the connection option "close".
+      </p>
+      <p id="rfc.section.6.3.2.1.p.3">If either the client or the server sends the "close" option in the Connection header field, that request becomes the last
+         one for the connection.
       </p>
       <p id="rfc.section.6.3.2.1.p.4">Clients and servers <em class="bcp14">SHOULD NOT</em> assume that a persistent connection is maintained for HTTP versions less than 1.1 unless it is explicitly signaled. See <a href="#compatibility.with.http.1.0.persistent.connections" title="Keep-Alive Connections">Appendix&nbsp;A.1.2</a> for more information on backward compatibility with HTTP/1.0 clients.
@@ -3000 +3001 @@
       </p>
       <p id="rfc.section.A.2.p.13">Change ABNF productions for header fields to only define the field value.</p>
-      <p id="rfc.section.A.2.p.14">Clarify exactly when close connection options have to be sent. (<a href="#header.connection" id="rfc.xref.header.connection.11" title="Connection">Section&nbsp;6.1</a>)
+      <p id="rfc.section.A.2.p.14">Clarify exactly when "close" connection options have to be sent. (<a href="#header.connection" id="rfc.xref.header.connection.11" title="Connection">Section&nbsp;6.1</a>)
       </p>
       <p id="rfc.section.A.2.p.15">Define the semantics of the "Upgrade" header field in responses other than 101 (this was incorporated from <a href="#RFC2817" id="rfc.xref.RFC2817.3"><cite title="Upgrading to TLS Within HTTP/1.1">[RFC2817]</cite></a>). (<a href="#header.upgrade" id="rfc.xref.header.upgrade.2" title="Upgrade">Section&nbsp;6.5</a>)

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

@@ -2926 +2926 @@
    An HTTP/1.1 server &MAY; assume that a HTTP/1.1 client intends to
    maintain a persistent connection unless a Connection header field including
-   the connection-token "close" was sent in the request. If the server
+   the connection option "close" was sent in the request. If the server
    chooses to close the connection immediately after sending the
    response, it &SHOULD; send a Connection header field including the
-   connection-token "close".
+   connection option "close".
 </t>
 <t>
    An HTTP/1.1 client &MAY; expect a connection to remain open, but would
    decide to keep it open based on whether the response from a server
-   contains a Connection header field with the connection-token close. In case
+   contains a Connection header field with the connection option "close". In case
    the client does not want to maintain a connection for more than that
    request, it &SHOULD; send a Connection header field including the
-   connection-token close.
-</t>
-<t>
-   If either the client or the server sends the close token in the
+   connection option "close".
+</t>
+<t>
+   If either the client or the server sends the "close" option in the
    Connection header field, that request becomes the last one for the
    connection.
@@ -4885 +4885 @@
 </t>
 <t>
-  Clarify exactly when close connection options have to be sent.
+  Clarify exactly when "close" connection options have to be sent.
   (<xref target="header.connection"/>)
 </t>