Skip to content

Commit

Permalink
[giow] (0) WebSocket: Disallow this controversial extension rather th…
Browse files Browse the repository at this point in the history
…an require it.

git-svn-id: http://svn.whatwg.org/webapps@6330 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jul 27, 2011
1 parent c542e2d commit d3622f2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
18 changes: 8 additions & 10 deletions complete.html
Expand Up @@ -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 26 July 2011</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 27 July 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>
Expand Down Expand Up @@ -80392,13 +80392,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, a list containing
just "<code title="">deflate-stream</code>" 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>
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
Expand Down Expand Up @@ -80463,8 +80462,7 @@ <h4 id=the-websocket-interface><span class=secno>11.3.2 </span>The <code><a href

<p class=note>The <code title=dom-WebSocket-extensions><a href=#dom-websocket-extensions>extensions</a></code> attribute returns
the extensions selected by the server, if any. (Currently this will
only ever be either the empty string or "deflate-stream", the latter
indicating that the data is being compressed.)</p>
only ever be the empty string.)</p>

<p>The <dfn id=dom-websocket-protocol title=dom-WebSocket-protocol><code>protocol</code></dfn> attribute
must initially return the empty string. After <i><a href=#the-websocket-connection-is-established>the WebSocket
Expand Down
19 changes: 9 additions & 10 deletions source
Expand Up @@ -91010,14 +91010,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, a list containing
just "<code title="">deflate-stream</code>" 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>
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
Expand Down Expand Up @@ -91096,8 +91096,7 @@ interface <dfn>WebSocket</dfn> {
<p class="note">The <code
title="dom-WebSocket-extensions">extensions</code> attribute returns
the extensions selected by the server, if any. (Currently this will
only ever be either the empty string or "deflate-stream", the latter
indicating that the data is being compressed.)</p>
only ever be the empty string.)</p>

<p>The <dfn
title="dom-WebSocket-protocol"><code>protocol</code></dfn> attribute
Expand Down

0 comments on commit d3622f2

Please sign in to comment.