[] (0) Prevent onunload hijacks.

git-svn-id: http://svn.whatwg.org/webapps@4105 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 12, 2009 · df00bc5 · df00bc5
1 parent b1e6ac3
commit df00bc5
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/complete.html b/complete.html
@@ -110,7 +110,7 @@
 
   <header class=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Draft Standard &mdash; 11 October 2009</h2>
+    <h2 class="no-num no-toc">Draft Standard &mdash; 12 October 2009</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -55081,6 +55081,19 @@ <h4 id=navigating-across-documents><span class=secno>6.11.1 </span>Navigating ac
    that was going to be <a href=#navigate title=navigate>navigated</a>
    instead.</li>
 
+   <li><p>If there is a preexisting attempt to navigate the
+   <a href=#browsing-context>browsing context</a>, and the <a href=#source-browsing-context>source browsing
+   context</a> is the same as the <a href=#browsing-context>browsing context</a>
+   being navigated, and that attempt is currently
+   running the <a href=#unload-a-document>unload a document</a> algorithm, and the
+   <a href=#origin>origin</a> of the <a href=#url>URL</a> of the resource being
+   loaded in that navigation is not the <a href=#same-origin>same origin</a> as
+   the <a href=#origin>origin</a> of the <a href=#url>URL</a> of the resource
+   being loaded in <em>this</em> navigation, then abort these steps
+   without affecting the preexisting attempt to navigate the
+   <a href=#browsing-context>browsing context</a>.</li>
+   <!-- http://www.hixie.ch/tests/adhoc/html/navigation/unload/ -->
+
    <li><p>If there is a preexisting attempt to navigate the
    <a href=#browsing-context>browsing context</a>, and either that attempt has not yet
    <a href=#concept-navigate-mature title=concept-navigate-mature>matured</a> (i.e. it has

diff --git a/index b/index
@@ -111,7 +111,7 @@
 
   <header class=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>HTML5</h1>
-    <h2 class="no-num no-toc">Draft Standard &mdash; 11 October 2009</h2>
+    <h2 class="no-num no-toc">Draft Standard &mdash; 12 October 2009</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -52247,6 +52247,19 @@ NETWORK:
    that was going to be <a href=#navigate title=navigate>navigated</a>
    instead.</li>
 
+   <li><p>If there is a preexisting attempt to navigate the
+   <a href=#browsing-context>browsing context</a>, and the <a href=#source-browsing-context>source browsing
+   context</a> is the same as the <a href=#browsing-context>browsing context</a>
+   being navigated, and that attempt is currently
+   running the <a href=#unload-a-document>unload a document</a> algorithm, and the
+   <a href=#origin>origin</a> of the <a href=#url>URL</a> of the resource being
+   loaded in that navigation is not the <a href=#same-origin>same origin</a> as
+   the <a href=#origin>origin</a> of the <a href=#url>URL</a> of the resource
+   being loaded in <em>this</em> navigation, then abort these steps
+   without affecting the preexisting attempt to navigate the
+   <a href=#browsing-context>browsing context</a>.</li>
+   <!-- http://www.hixie.ch/tests/adhoc/html/navigation/unload/ -->
+
    <li><p>If there is a preexisting attempt to navigate the
    <a href=#browsing-context>browsing context</a>, and either that attempt has not yet
    <a href=#concept-navigate-mature title=concept-navigate-mature>matured</a> (i.e. it has

diff --git a/source b/source
@@ -62203,6 +62203,19 @@ NETWORK:
    that was going to be <span title="navigate">navigated</span>
    instead.</p></li>
 
+   <li><p>If there is a preexisting attempt to navigate the
+   <span>browsing context</span>, and the <span>source browsing
+   context</span> is the same as the <span>browsing context</span>
+   being navigated, and that attempt is currently
+   running the <span>unload a document</span> algorithm, and the
+   <span>origin</span> of the <span>URL</span> of the resource being
+   loaded in that navigation is not the <span>same origin</span> as
+   the <span>origin</span> of the <span>URL</span> of the resource
+   being loaded in <em>this</em> navigation, then abort these steps
+   without affecting the preexisting attempt to navigate the
+   <span>browsing context</span>.</p></li>
+   <!-- http://www.hixie.ch/tests/adhoc/html/navigation/unload/ -->
+
    <li><p>If there is a preexisting attempt to navigate the
    <span>browsing context</span>, and either that attempt has not yet
    <span title="concept-navigate-mature">matured</span> (i.e. it has