[] (0) Fix some issues with the recent CORSification of EventSource.

git-svn-id: http://svn.whatwg.org/webapps@6257 340c8d12-0b0e-0410-8428-c7bf67bfef74

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 17 June 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 20 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>
@@ -3655,6 +3655,8 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
 
     <ul class=brief><li><dfn id=cross-origin-request>cross-origin request</dfn>
      <li><dfn id=cross-origin-request-status>cross-origin request status</dfn>
+     <li><dfn id=custom-request-headers>custom request headers</dfn>
+     <li><dfn id=simple-cross-origin-request>simple cross-origin request</dfn>
      <li><dfn id=redirect-steps>redirect steps</dfn>
      <li><dfn id=credential-flag>credential flag</dfn>
      <li><dfn id=resource-sharing-check>resource sharing check</dfn>
@@ -78853,12 +78855,6 @@ <h4 id=the-eventsource-interface><span class=secno>11.2.2 </span>The <code><a hr
    <li><p>Return a new <code><a href=#eventsource>EventSource</a></code> object, and continue
    these steps in the background (without blocking scripts).</li>
 
-   <li><p>If the <a href=#origin>origin</a> of the resulting <a href=#absolute-url>absolute
-   URL</a> is not the <a href=#same-origin>same origin</a> as that of the
-   <a href=#entry-script>entry script</a>, then act as if the resource could not be
-   obtained due to a network error: <a href=#fail-the-connection>fail the connection</a>
-   and abort these steps.</li>
-
    <li>
 
     <p>Do a <a href=#potentially-cors-enabled-fetch>potentially CORS-enabled fetch</a> of the
@@ -78960,8 +78956,11 @@ <h4 id=processing-model-5><span class=secno>11.2.3 </span>Processing model</h4>
 
   <p>User agents should use the <code>Cache-Control: no-cache</code>
   header in requests to bypass any caches for requests of event
-  sources. User agents should ignore HTTP cache headers in the
-  response, never caching event sources.</p>
+  sources. (This header is not a <a href=#custom-request-headers title="custom request
+  headers">custom request header</a>, so the user agent will still
+  use the CORS <a href=#simple-cross-origin-request>simple cross-origin request</a> mechanism.)
+  User agents should ignore HTTP cache headers in the response, never
+  caching event sources.</p>
 
   <hr><p>As data is received, the <a href=#concept-task title=concept-task>tasks</a>
   queued by the <a href=#networking-task-source>networking task source</a> to handle the data

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 17 June 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 20 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>
@@ -3557,6 +3557,8 @@ explained in the previous section, which talks about RFC 2119. -->
 
     <ul class=brief><li><dfn id=cross-origin-request>cross-origin request</dfn>
      <li><dfn id=cross-origin-request-status>cross-origin request status</dfn>
+     <li><dfn id=custom-request-headers>custom request headers</dfn>
+     <li><dfn id=simple-cross-origin-request>simple cross-origin request</dfn>
      <li><dfn id=redirect-steps>redirect steps</dfn>
      <li><dfn id=credential-flag>credential flag</dfn>
      <li><dfn id=resource-sharing-check>resource sharing check</dfn>

source

@@ -2579,6 +2579,8 @@ explained in the previous section, which talks about RFC 2119. -->
     <ul class="brief">
      <li><dfn>cross-origin request</dfn>
      <li><dfn>cross-origin request status</dfn>
+     <li><dfn>custom request headers</dfn>
+     <li><dfn>simple cross-origin request</dfn>
      <li><dfn>redirect steps</dfn>
      <li><dfn>credential flag</dfn>
      <li><dfn>resource sharing check</dfn>
@@ -89373,12 +89375,6 @@ interface <dfn>EventSource</dfn> {
    <li><p>Return a new <code>EventSource</code> object, and continue
    these steps in the background (without blocking scripts).</p></li>
 
-   <li><p>If the <span>origin</span> of the resulting <span>absolute
-   URL</span> is not the <span>same origin</span> as that of the
-   <span>entry script</span>, then act as if the resource could not be
-   obtained due to a network error: <span>fail the connection</span>
-   and abort these steps.</p></li>
-
    <li>
 
     <p>Do a <span>potentially CORS-enabled fetch</span> of the
@@ -89509,8 +89505,11 @@ interface <dfn>EventSource</dfn> {
 
   <p>User agents should use the <code>Cache-Control: no-cache</code>
   header in requests to bypass any caches for requests of event
-  sources. User agents should ignore HTTP cache headers in the
-  response, never caching event sources.</p>
+  sources. (This header is not a <span title="custom request
+  headers">custom request header</span>, so the user agent will still
+  use the CORS <span>simple cross-origin request</span> mechanism.)
+  User agents should ignore HTTP cache headers in the response, never
+  caching event sources.</p>
 
   <hr>