[html5] r5330 - [e] (0) Allow XHR a way to block cookies. Fixing http://www.w3.org/Bugs/Public/s [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-08-24 11:52:40 -0700 (Tue, 24 Aug 2010)
New Revision: 5330

Modified:
   complete.html
   index
   source
Log:
[e] (0) Allow XHR a way to block cookies.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9604

Modified: complete.html
===================================================================
--- complete.html	2010-08-24 08:28:29 UTC (rev 5329)
+++ complete.html	2010-08-24 18:52:40 UTC (rev 5330)
@@ -6177,9 +6177,9 @@
   <p>When a user agent is to <dfn id=fetch>fetch</dfn> a resource or
   <a href=#url>URL</a>, optionally from an origin <i title="">origin</i>,
   and optionally with a <i>synchronous flag</i>, a <i>manual redirect
-  flag</i>, and/or a <i>force same-origin flag</i>, the following
-  steps must be run. (When a <em>URL</em> is to be fetched, the URL
-  identifies a resource to be obtained.)</p>
+  flag</i>, a <i>force same-origin flag</i>, and/or a <i>block cookies
+  flag</i>, the following steps must be run. (When a <em>URL</em> is
+  to be fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the
   storage mutex first -->
@@ -6194,6 +6194,8 @@
   the same as the /origin/, which must also be present, and the
   algorithm must not be invoked with the manual redirect flag. -->
 
+  <!-- "block cookies" is currently only used by XHR -->
+
   <ol><li>
 
     <p>Generate the <i>address of the resource from which Request-URIs
@@ -6269,8 +6271,9 @@
 
    <li>
 
-    <p>If there are cookies to be set, then the user agent must run
-    the following substeps:</p>
+    <p>If the algorithm was not invoked with the <i>block cookies
+    flag</i>, and there are cookies to be set, then the user agent
+    must run the following substeps:</p>
 
     <ol><li><p>Wait until ownership of the <a href=#storage-mutex>storage mutex</a> can
      be taken by this instance of the <a href=#fetch title=fetch>fetching</a> algorithm.</li>

Modified: index
===================================================================
--- index	2010-08-24 08:28:29 UTC (rev 5329)
+++ index	2010-08-24 18:52:40 UTC (rev 5330)
@@ -6099,9 +6099,9 @@
   <p>When a user agent is to <dfn id=fetch>fetch</dfn> a resource or
   <a href=#url>URL</a>, optionally from an origin <i title="">origin</i>,
   and optionally with a <i>synchronous flag</i>, a <i>manual redirect
-  flag</i>, and/or a <i>force same-origin flag</i>, the following
-  steps must be run. (When a <em>URL</em> is to be fetched, the URL
-  identifies a resource to be obtained.)</p>
+  flag</i>, a <i>force same-origin flag</i>, and/or a <i>block cookies
+  flag</i>, the following steps must be run. (When a <em>URL</em> is
+  to be fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the
   storage mutex first -->
@@ -6116,6 +6116,8 @@
   the same as the /origin/, which must also be present, and the
   algorithm must not be invoked with the manual redirect flag. -->
 
+  <!-- "block cookies" is currently only used by XHR -->
+
   <ol><li>
 
     <p>Generate the <i>address of the resource from which Request-URIs
@@ -6191,8 +6193,9 @@
 
    <li>
 
-    <p>If there are cookies to be set, then the user agent must run
-    the following substeps:</p>
+    <p>If the algorithm was not invoked with the <i>block cookies
+    flag</i>, and there are cookies to be set, then the user agent
+    must run the following substeps:</p>
 
     <ol><li><p>Wait until ownership of the <a href=#storage-mutex>storage mutex</a> can
      be taken by this instance of the <a href=#fetch title=fetch>fetching</a> algorithm.</li>

Modified: source
===================================================================
--- source	2010-08-24 08:28:29 UTC (rev 5329)
+++ source	2010-08-24 18:52:40 UTC (rev 5330)
@@ -5733,9 +5733,9 @@
   <p>When a user agent is to <dfn>fetch</dfn> a resource or
   <span>URL</span>, optionally from an origin <i title="">origin</i>,
   and optionally with a <i>synchronous flag</i>, a <i>manual redirect
-  flag</i>, and/or a <i>force same-origin flag</i>, the following
-  steps must be run. (When a <em>URL</em> is to be fetched, the URL
-  identifies a resource to be obtained.)</p>
+  flag</i>, a <i>force same-origin flag</i>, and/or a <i>block cookies
+  flag</i>, the following steps must be run. (When a <em>URL</em> is
+  to be fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the
   storage mutex first -->
@@ -5750,6 +5750,8 @@
   the same as the /origin/, which must also be present, and the
   algorithm must not be invoked with the manual redirect flag. -->
 
+  <!-- "block cookies" is currently only used by XHR -->
+
   <ol>
 
    <li>
@@ -5840,8 +5842,9 @@
 
    <li>
 
-    <p>If there are cookies to be set, then the user agent must run
-    the following substeps:</p>
+    <p>If the algorithm was not invoked with the <i>block cookies
+    flag</i>, and there are cookies to be set, then the user agent
+    must run the following substeps:</p>
 
     <ol>