[giow] (3) WebSocket.url should be consistent with how the URL is use…

…d in the first place. Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=23821 Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@8305 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 21, 2013 · 50d65e8 · 50d65e8
1 parent f36a6e2
commit 50d65e8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/complete.html b/complete.html
@@ -298,7 +298,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 20 November 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 21 November 2013</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>
@@ -6672,20 +6672,24 @@ <h4 id=resolving-urls><span class=secno>2.5.2 </span>Resolving URLs</h4>
 
     <p>Let <var title="">encoding</var> be determined as follows:</p>
 
-    <dl class=switch><dt>If the URL had a character encoding defined when the URL was created or defined</dt>
+    <dl class=switch><dt>If the URL had a character encoding defined when the URL was created or defined or when
+     this algorithm was invoked</dt>
 
      <dd>The URL character encoding is as defined.</dd>
 
+
      <dt>If the URL came from a script (e.g. as an argument to a method)</dt>
 
 <!--CLEANUP-->
      <dd>The URL character encoding is the <a href=#api-url-character-encoding>API URL character encoding</a> specified by the script's <a href=#settings-object>settings object</a>.</dd>
 
+
      <dt>If the URL came from a DOM node (e.g. from an element)</dt>
 
      <dd>The node has a <code><a href=#document>Document</a></code>, and the URL character encoding is the
      <a href="#document's-character-encoding">document's character encoding</a>.</dd>
 
+
     </dl></li>
 
    <li><p>If <var title="">encoding</var> is <a href=#a-utf-16-encoding>a UTF-16 encoding</a>, then change the value
@@ -79103,8 +79107,8 @@ <h4 id=the-websocket-interface><span class=secno>9.3.2 </span>The <code><a href=
 
   </ol><hr><p>The <dfn id=dom-websocket-url title=dom-WebSocket-url><code>url</code></dfn> attribute must return the result of
   <a href=#resolve-a-url title="resolve a url">resolving</a> the <a href=#url>URL</a> that was passed to the
-  constructor. (It doesn't matter what it is resolved relative to, since we already know it is an
-  <a href=#absolute-url>absolute URL</a>.)</p>
+  constructor, with the URL character encoding set to UTF-8. (It doesn't matter what it is resolved
+  relative to, since we already know it is an <a href=#absolute-url>absolute URL</a>.)</p>
 
   <p>The <dfn id=dom-websocket-readystate title=dom-WebSocket-readyState><code>readyState</code></dfn> attribute represents
   the state of the connection. It can have the following values:</p>
@@ -101343,6 +101347,7 @@ <h2 class=no-num id=references>References</h2><!--REFS-->
    <dt id=refsRFC3490>[RFC3490]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc3490>Internationalizing Domain Names in Applications (IDNA)</a></cite>, P. Faltstrom, P. Hoffman, A. Costello. IETF.</dd>
 
+<!--CLEANUP--><!--replace references to this with references to encodings standard-->
    <dt id=refsRFC3629>[RFC3629]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc3629>UTF-8, a transformation format of ISO 10646</a></cite>, F. Yergeau. IETF.</dd>
 

diff --git a/index b/index
@@ -298,7 +298,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 20 November 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 21 November 2013</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>
@@ -6672,20 +6672,24 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
 
     <p>Let <var title="">encoding</var> be determined as follows:</p>
 
-    <dl class=switch><dt>If the URL had a character encoding defined when the URL was created or defined</dt>
+    <dl class=switch><dt>If the URL had a character encoding defined when the URL was created or defined or when
+     this algorithm was invoked</dt>
 
      <dd>The URL character encoding is as defined.</dd>
 
+
      <dt>If the URL came from a script (e.g. as an argument to a method)</dt>
 
 <!--CLEANUP-->
      <dd>The URL character encoding is the <a href=#api-url-character-encoding>API URL character encoding</a> specified by the script's <a href=#settings-object>settings object</a>.</dd>
 
+
      <dt>If the URL came from a DOM node (e.g. from an element)</dt>
 
      <dd>The node has a <code><a href=#document>Document</a></code>, and the URL character encoding is the
      <a href="#document's-character-encoding">document's character encoding</a>.</dd>
 
+
     </dl></li>
 
    <li><p>If <var title="">encoding</var> is <a href=#a-utf-16-encoding>a UTF-16 encoding</a>, then change the value
@@ -79103,8 +79107,8 @@ interface <dfn id=websocket>WebSocket</dfn> : <a href=#eventtarget>EventTarget</
 
   </ol><hr><p>The <dfn id=dom-websocket-url title=dom-WebSocket-url><code>url</code></dfn> attribute must return the result of
   <a href=#resolve-a-url title="resolve a url">resolving</a> the <a href=#url>URL</a> that was passed to the
-  constructor. (It doesn't matter what it is resolved relative to, since we already know it is an
-  <a href=#absolute-url>absolute URL</a>.)</p>
+  constructor, with the URL character encoding set to UTF-8. (It doesn't matter what it is resolved
+  relative to, since we already know it is an <a href=#absolute-url>absolute URL</a>.)</p>
 
   <p>The <dfn id=dom-websocket-readystate title=dom-WebSocket-readyState><code>readyState</code></dfn> attribute represents
   the state of the connection. It can have the following values:</p>
@@ -101343,6 +101347,7 @@ if (s = prompt('What is your name?')) {
    <dt id=refsRFC3490>[RFC3490]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc3490>Internationalizing Domain Names in Applications (IDNA)</a></cite>, P. Faltstrom, P. Hoffman, A. Costello. IETF.</dd>
 
+<!--CLEANUP--><!--replace references to this with references to encodings standard-->
    <dt id=refsRFC3629>[RFC3629]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc3629>UTF-8, a transformation format of ISO 10646</a></cite>, F. Yergeau. IETF.</dd>
 

diff --git a/source b/source
@@ -6040,20 +6040,25 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
 
     <dl class="switch">
 
-     <dt>If the URL had a character encoding defined when the URL was created or defined</dt>
+
+     <dt>If the URL had a character encoding defined when the URL was created or defined or when
+     this algorithm was invoked</dt>
 
      <dd>The URL character encoding is as defined.</dd>
 
+
      <dt>If the URL came from a script (e.g. as an argument to a method)</dt>
 
 <!--CLEANUP-->
      <dd>The URL character encoding is the <span>API URL character encoding</span> specified by the script's <span>settings object</span>.</dd>
 
+
      <dt>If the URL came from a DOM node (e.g. from an element)</dt>
 
      <dd>The node has a <code>Document</code>, and the URL character encoding is the
      <span>document's character encoding</span>.</dd>
 
+
     </dl>
 
    </li>
@@ -88599,8 +88604,8 @@ interface <dfn>WebSocket</dfn> : <span>EventTarget</span> {
 
   <p>The <dfn data-x="dom-WebSocket-url"><code>url</code></dfn> attribute must return the result of
   <span data-x="resolve a url">resolving</span> the <span>URL</span> that was passed to the
-  constructor. (It doesn't matter what it is resolved relative to, since we already know it is an
-  <span>absolute URL</span>.)</p>
+  constructor, with the URL character encoding set to UTF-8. (It doesn't matter what it is resolved
+  relative to, since we already know it is an <span>absolute URL</span>.)</p>
 
   <p>The <dfn data-x="dom-WebSocket-readyState"><code>readyState</code></dfn> attribute represents
   the state of the connection. It can have the following values:</p>
@@ -113204,6 +113209,7 @@ if (s = prompt('What is your name?')) {
    <dt id="refsRFC3490">[RFC3490]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc3490">Internationalizing Domain Names in Applications (IDNA)</a></cite>, P. Faltstrom, P. Hoffman, A. Costello. IETF.</dd>
 
+<!--CLEANUP--><!--replace references to this with references to encodings standard-->
    <dt id="refsRFC3629">[RFC3629]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc3629">UTF-8, a transformation format of ISO 10646</a></cite>, F. Yergeau. IETF.</dd>