[giow] (0) Fix cookies and WebSockets

git-svn-id: http://svn.whatwg.org/webapps@6189 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 6, 2011 · a8e8e12 · a8e8e12
1 parent 1118639
commit a8e8e12
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/complete.html b/complete.html
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 4 June 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 6 June 2011</h2>
    </hgroup><dl><dt>Multiple-page version:</dt>
     <dd><a href=http://www.whatwg.org/specs/web-apps/current-work/complete/>http://www.whatwg.org/specs/web-apps/current-work/complete/</a></dd>
     <dt>One-page version:</dt>
@@ -3473,7 +3473,8 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
 
     <p>The following term is defined in the Cookie specification: <a href=#refsCOOKIES>[COOKIES]</a></p>
 
-    <ul class=brief><li><dfn id=receives-a-set-cookie-string>Receives a set-cookie-string</dfn>
+    <ul class=brief><li><dfn id=cookie-string>cookie-string</dfn>
+     <li><dfn id=receives-a-set-cookie-string>receives a set-cookie-string</dfn>
     </ul></dd>
 
    <dt>CORS</dt>
@@ -3532,6 +3533,7 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
      <li><dfn id=the-websocket-connection-is-established>the WebSocket connection is established</dfn>
      <li><dfn id="validate-the-server's-response">validate the server's response</dfn>
      <li><dfn id=subprotocol-in-use>subprotocol in use</dfn>
+     <li><dfn id=headers-to-send-appropriate-cookies>headers to send appropriate cookies</dfn>
      <li><dfn id="cookies-set-during-the-server's-opening-handshake">cookies set during the server's opening handshake</dfn>
      <li><dfn id=a-websocket-message-has-been-received>a WebSocket message has been received</dfn>
      <li><dfn id=fail-the-websocket-connection>fail the WebSocket connection</dfn>
@@ -79187,8 +79189,12 @@ <h4 id=the-websocket-interface><span class=secno>11.3.2 </span>The <code><a href
    <li>
 
     <p><i><a href=#establish-a-websocket-connection>Establish a WebSocket connection</a></i> given the set (<var title="">host</var>, <var title="">port</var>, <var title="">resource name</var>, <var title="">secure</var>), along
-    with the <var title="">protocols</var> list and an empty list for
-    the extensions, and <var title="">origin</var>. <a href=#refsWSP>[WSP]</a></p>
+    with the <var title="">protocols</var> list, an empty list for the
+    extensions, and <var title="">origin</var>. The <i><a href=#headers-to-send-appropriate-cookies>headers to send
+    appropriate cookies</a></i> must be a <code title=http-Cookie>Cookie</code> header whose value is the
+    <i><a href=#cookie-string>cookie-string</a></i> computed from the user's cookie store and the
+    URL <var title="">url</var>; for these purposes this is
+    <em>not</em> a "non-HTTP" API. <a href=#refsWSP>[WSP]</a> <a href=#refsCOOKIES>[COOKIES]</a></p>
 
     <p>When the user agent <i title="validate the server's
     response"><a href="#validate-the-server's-response">validates the server's response</a></i> during the
@@ -79493,9 +79499,9 @@ <h4 id=the-websocket-interface><span class=secno>11.3.2 </span>The <code><a href
    the <i><a href=#subprotocol-in-use>subprotocol in use</a></i>, if is not the null value. <a href=#refsWSP>[WSP]</a></li>
 
    <li><p>Act as if the user agent had <a href=#receives-a-set-cookie-string title="receives a
-   set-cookie-string">received a set-cookie-string</a> for
-   <a href="#the-document's-address">the document's address</a>, consisting of the <i><a href="#cookies-set-during-the-server's-opening-handshake">cookies
-   set during the server's opening handshake</a></i>. <a href=#refsCOOKIES>[COOKIES]</a> <a href=#refsRFC3629>[RFC3629]</a> <a href=#refsWSP>[WSP]</a></li>
+   set-cookie-string">received a set-cookie-string</a> consisting
+   of the <i><a href="#cookies-set-during-the-server's-opening-handshake">cookies set during the server's opening handshake</a></i>,
+   for the URL <var title="">url</var> given to the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor. <a href=#refsCOOKIES>[COOKIES]</a> <a href=#refsRFC3629>[RFC3629]</a> <a href=#refsWSP>[WSP]</a></li>
 
    <li><p><a href=#fire-a-simple-event>Fire a simple event</a> named <code title=event-open>open</code> at the <code><a href=#websocket>WebSocket</a></code>
    object.</p>

diff --git a/index b/index
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 4 June 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 6 June 2011</h2>
    </hgroup><dl><dt><strong>Web developer edition</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -3490,7 +3490,8 @@ explained in the previous section, which talks about RFC 2119. -->
 
     <p>The following term is defined in the Cookie specification: <a href=#refsCOOKIES>[COOKIES]</a></p>
 
-    <ul class=brief><li><dfn id=receives-a-set-cookie-string>Receives a set-cookie-string</dfn>
+    <ul class=brief><li><dfn id=cookie-string>cookie-string</dfn>
+     <li><dfn id=receives-a-set-cookie-string>receives a set-cookie-string</dfn>
     </ul></dd>
 
    <dt>CORS</dt>

diff --git a/source b/source
@@ -2501,7 +2501,8 @@ explained in the previous section, which talks about RFC 2119. -->
     href="#refsCOOKIES">[COOKIES]</a></p>
 
     <ul class="brief">
-     <li><dfn>Receives a set-cookie-string</dfn>
+     <li><dfn>cookie-string</dfn>
+     <li><dfn>receives a set-cookie-string</dfn>
     </ul>
 
    </dd>
@@ -2570,6 +2571,7 @@ explained in the previous section, which talks about RFC 2119. -->
      <li><dfn>the WebSocket connection is established</dfn>
      <li><dfn>validate the server's response</dfn>
      <li><dfn>subprotocol in use</dfn>
+     <li><dfn>headers to send appropriate cookies</dfn>
      <li><dfn>cookies set during the server's opening handshake</dfn>
      <li><dfn>a WebSocket message has been received</dfn>
      <li><dfn>fail the WebSocket connection</dfn>
@@ -89888,9 +89890,14 @@ interface <dfn>WebSocket</dfn> {
     <p><i>Establish a WebSocket connection</i> given the set (<var
     title="">host</var>, <var title="">port</var>, <var
     title="">resource name</var>, <var title="">secure</var>), along
-    with the <var title="">protocols</var> list and an empty list for
-    the extensions, and <var title="">origin</var>. <a
-    href="#refsWSP">[WSP]</a></p>
+    with the <var title="">protocols</var> list, an empty list for the
+    extensions, and <var title="">origin</var>. The <i>headers to send
+    appropriate cookies</i> must be a <code
+    title="http-Cookie">Cookie</code> header whose value is the
+    <i>cookie-string</i> computed from the user's cookie store and the
+    URL <var title="">url</var>; for these purposes this is
+    <em>not</em> a "non-HTTP" API. <a href="#refsWSP">[WSP]</a> <a
+    href="#refsCOOKIES">[COOKIES]</a></p>
 
     <p>When the user agent <i title="validate the server's
     response">validates the server's response</i> during the
@@ -90275,9 +90282,10 @@ socket.onopen = function () {
    href="#refsWSP">[WSP]</a></p></li>
 
    <li><p>Act as if the user agent had <span title="receives a
-   set-cookie-string">received a set-cookie-string</span> for
-   <span>the document's address</span>, consisting of the <i>cookies
-   set during the server's opening handshake</i>. <a
+   set-cookie-string">received a set-cookie-string</span> consisting
+   of the <i>cookies set during the server's opening handshake</i>,
+   for the URL <var title="">url</var> given to the <code
+   title="dom-WebSocket">WebSocket()</code> constructor. <a
    href="#refsCOOKIES">[COOKIES]</a> <a
    href="#refsRFC3629">[RFC3629]</a> <a
    href="#refsWSP">[WSP]</a></p></li>