Skip to content

Commit bed7ad2

Browse files
mikewestmikewest
committed
MIX: Regenerate HTML.
1 parent a3d850b commit bed7ad2

File tree

1 file changed

+90
-107
lines changed

1 file changed

+90
-107
lines changed

‎specs/mixedcontent/index.html

Lines changed: 90 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,10 +1040,11 @@ <h3 class="heading settled" data-level="5.3" id="should-block-fetch"><span class
10401040
<li>
10411041
<var>request</var>’s <a data-link-type="dfn" href="http://dom.spec.whatwg.org/#concept-PI-target">target</a> is "<code>document</code>", and
10421042
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>’s <a data-link-type="dfn" href="http://www.w3.org/TR/html5/webappapis.html#responsible-browsing-context">responsible browsing
1043-
context</a> has no <a data-link-type="dfn">parent browsing context</a>.
1043+
context</a> has no <a data-link-type="dfn" href="http://www.w3.org/TR/html5/browsers.html#parent-browsing-context">parent browsing context</a>.
10441044

10451045

1046-
<p class="issue" id="issue-cb07f5b7"><a class="self-link" href="#issue-cb07f5b7"></a> Is this right, Anne?</p>
1046+
<p class="issue" id="issue-58787eb8"><a class="self-link" href="#issue-58787eb8"></a> This doesn’t yet work correctly for content inside an
1047+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">iframe</a></code> or <code><a data-link-type="element" href="http://www.w3.org/TR/html5/obsolete.html#frame">frame</a></code>.</p>
10471048

10481049

10491050

@@ -1080,26 +1081,8 @@ <h3 class="heading settled" data-level="5.3" id="should-block-fetch"><span class
10801081

10811082
<li>
10821083
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is "<code>fetch</code>", and
1083-
<a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is "<code>subresource</code>", and either of the
1084-
following conditions are met:
1085-
1086-
1087-
<ol>
1088-
1089-
<li>
1090-
<var>request</var> is <em>not</em> a <a data-link-type="dfn" href="#passthrough-request">passthrough
1091-
request</a>.
1092-
1093-
1094-
1095-
<li>
1096-
If <var>request</var>’s <code>mode</code> is not
1097-
<code>no-cors</code>.
1098-
1099-
1100-
1101-
</ol>
1102-
1084+
<a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is "<code>subresource</code>", and
1085+
<var>request</var> is <em>not</em> a <a data-link-type="dfn" href="#passthrough-request">passthrough request</a>.
11031086

11041087

11051088

@@ -1196,113 +1179,108 @@ <h3 class="heading settled" data-level="5.4" id="should-block-response"><span cl
11961179
<ol>
11971180

11981181
<li>
1199-
If <a href="#categorize-settings-object">§5.1 Does settings object restrict mixed content?</a> returns <code>Does Not Restrict
1200-
Mixed Content</code> when applied to <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>,
1201-
return <strong>allowed</strong>.
1202-
1203-
1204-
1205-
<li>
1206-
If the user agent has been instructed to allow <a data-link-type="dfn" href="#mixed-content">mixed content</a>
1207-
(as outlined in <a href="#requirements-user-controls">§7.4 User Controls</a>), return
1208-
<strong>allowed</strong>.
1182+
Return <strong>allowed</strong> if one or more of the following
1183+
conditions are met:
1184+
1185+
1186+
<ol>
1187+
1188+
<li>
1189+
<a href="#categorize-settings-object">§5.1 Does settings object restrict mixed content?</a> returns <code>Does Not Restrict
1190+
Mixed Content</code> when applied to <var>request</var>’s
1191+
<a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>.
1192+
1193+
1194+
1195+
<li>
1196+
<var>response</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-https-state">HTTPS state</a> is
1197+
<code>authenticated</code>.
1198+
1199+
1200+
1201+
<li>
1202+
The user agent has been instructed to allow <a data-link-type="dfn" href="#mixed-content">mixed content</a>, as
1203+
described in <a href="#requirements-user-controls">§7.4 User Controls</a>).
1204+
1205+
1206+
1207+
<li>
1208+
<var>request</var>’s <a data-link-type="dfn" href="http://dom.spec.whatwg.org/#concept-PI-target">target</a> is "<code>document</code>", and
1209+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>’s <a data-link-type="dfn" href="http://www.w3.org/TR/html5/webappapis.html#responsible-browsing-context">responsible browsing
1210+
context</a> has no <a data-link-type="dfn" href="http://www.w3.org/TR/html5/browsers.html#parent-browsing-context">parent browsing context</a>.
1211+
1212+
1213+
<p class="issue" id="issue-58787eb80"><a class="self-link" href="#issue-58787eb80"></a> This doesn’t yet work correctly for content inside an
1214+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">iframe</a></code> or <code><a data-link-type="element" href="http://www.w3.org/TR/html5/obsolete.html#frame">frame</a></code>.</p>
1215+
1216+
1217+
1218+
1219+
</ol>
1220+
12091221

12101222

12111223

12121224
<li>
1213-
Let <var>context</var> be the <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-context">request context</a> of
1214-
<var>request</var>.
1225+
Return <strong>blocked</strong> if one or more of the following
1226+
conditions are met:
1227+
1228+
1229+
<ol>
1230+
1231+
<li>
1232+
The user agent is configured to block <a data-link-type="dfn" href="#optionally_blockable">optionally-blockable</a>
1233+
mixed content, as described in <a href="#requirements-user-controls">§7.4 User Controls</a>.
1234+
1235+
1236+
1237+
<li>
1238+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>’s <a data-link-type="dfn" href="#strict-mixed-content-checking-flag">strict mixed content
1239+
checking flag</a> is <code>true</code>.
1240+
1241+
1242+
1243+
</ol>
1244+
12151245

12161246

12171247

12181248
<li>
1219-
If <var>response</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-response-https-state">HTTPS state</a> is not
1220-
<code>authenticated</code>:
1249+
Return <strong>allowed</strong> if <var>response</var> is an <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque">opaque
1250+
filtered response</a> and one or more of the following conditions are
1251+
met:
12211252

12221253

12231254
<ol>
12241255

12251256
<li>
1226-
If <var>context</var> is <code>fetch</code>:
1227-
1228-
1229-
<ol>
1230-
1231-
<li>
1232-
If <var>request</var> is <strong>not</strong> a <a data-link-type="dfn" href="#passthrough-request">passthrough
1233-
request</a>, return <strong>blocked</strong>.
1234-
1235-
1236-
1237-
<li>
1238-
If <var>response</var> is <strong>not</strong> an <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque">opaque
1239-
filtered response</a>, return <strong>blocked</strong>.
1240-
1241-
1242-
1243-
<li>
1244-
If the user agent is configured to block
1245-
<a data-link-type="dfn" href="#optionally_blockable">optionally-blockable</a> mixed content, return
1246-
<strong>blocked</strong>.
1247-
1257+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is "<code>fetch</code>", and
1258+
<var>request</var> is a <a data-link-type="dfn" href="#passthrough-request">passthrough request</a>.
12481259

1249-
1250-
<li>
1251-
If <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>’s <a data-link-type="dfn" href="#strict-mixed-content-checking-flag">strict mixed content
1252-
checking flag</a> is <code>true</code>, return
1253-
<strong>blocked</strong>.
1254-
1260+
12551261

1256-
1257-
</ol>
1258-
1262+
<li>
1263+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-type">type</a> is "<code>image</code>", and
1264+
<a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is not "<code>imageset</code>".
12591265

12601266

12611267

12621268
<li>
1263-
Otherwise:
1264-
1265-
1266-
<ol>
1267-
1268-
<li>
1269-
If <var>context</var> is a <a data-link-type="dfn">blockable request
1270-
context</a>, return <strong>blocked</strong>.
1271-
1272-
1273-
1274-
<li>
1275-
If the user agent is configured to block
1276-
<a data-link-type="dfn" href="#optionally_blockable">optionally-blockable</a> mixed content, return
1277-
<strong>blocked</strong>.
1278-
1269+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-type">type</a> is "<code>video</code>".
12791270

1280-
1281-
<li>
1282-
If <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a>’s <a data-link-type="dfn" href="#strict-mixed-content-checking-flag">strict mixed content
1283-
checking flag</a> is <code>true</code>, return
1284-
<strong>blocked</strong>.
1285-
1271+
12861272

1287-
1288-
</ol>
1289-
1273+
<li>
1274+
<var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-type">type</a> is "<code>audio</code>".
12901275

12911276

12921277

12931278
</ol>
12941279

1295-
1296-
1297-
<p class="note" role="note">Note: This covers both cases in which unauthenticated resources are
1298-
returned (by a Service Worker, for example), as well as cases in
1299-
which the TLS handshake succeeds, but the user agent chooses to hold
1300-
it to a higher standard.</p>
1301-
13021280

13031281

13041282

1305-
<li>Return <strong>allowed</strong>.
1283+
<li>Return <strong>blocked</strong>.
13061284

13071285

13081286
</ol>
@@ -1569,16 +1547,16 @@ <h3 class="heading settled" data-level="7.5" id="service-workers"><span class="s
15691547
<ol>
15701548
<li data-md="">
15711549
<p><a href="#should-block-fetch">§5.3 Should fetching request be blocked as mixed content?</a> has some carve-outs for the <code>fetch</code>
1572-
request context, with the intent of allowing a Service Worker to copy
1573-
a request as part of its response to a Fetch event (e.g.
1550+
request <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a>, with the intent of allowing a Service Worker
1551+
to copy a request as part of its response to a Fetch event (e.g.
15741552
<code>fetch(event.response)</code> should be executable inside the
15751553
event handler.</p>
15761554

15771555

15781556

1579-
<p>The <code>fetch</code> request context will continue to be treated as
1580-
<a data-link-type="dfn" href="#blockable">blockable</a> when executed outside the context of a Fetch event,
1581-
which of course includes document contexts.</p>
1557+
<p><code>fetch</code> will continue to be treated as <a data-link-type="dfn" href="#blockable">blockable</a> when
1558+
executed outside the context of a Fetch event, which of course includes
1559+
document contexts.</p>
15821560

15831561

15841562

@@ -1765,7 +1743,6 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
17651743
<li><a href="https://fetch.spec.whatwg.org/#navigation-request">navigation request</a>
17661744
<li><a href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque">opaque filtered response</a>
17671745
<li><a href="https://fetch.spec.whatwg.org/#concept-request">request</a>
1768-
<li><a href="https://fetch.spec.whatwg.org/#concept-request-context">request context</a>
17691746
<li><a href="https://fetch.spec.whatwg.org/#concept-response">response</a>
17701747
<li><a href="https://fetch.spec.whatwg.org/#concept-request-type">type</a>
17711748
</ul>
@@ -1777,12 +1754,15 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
17771754
<li><a href="http://www.w3.org/TR/html5/browsers.html#create-a-document-object">creating a new document object</a>
17781755
<li><a href="http://www.w3.org/TR/html5/webappapis.html#settings-object">environment settings object</a>
17791756
<li><a href="http://www.w3.org/TR/html5/forms.html#the-form-element">form</a>
1757+
<li><a href="http://www.w3.org/TR/html5/obsolete.html#frame">frame</a>
17801758
<li><a href="http://www.w3.org/TR/html5/webappapis.html#global-object">global object</a>
1759+
<li><a href="http://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">iframe</a>
17811760
<li><a href="http://www.w3.org/TR/html5/embedded-content-0.html#the-img-element">img</a>
17821761
<li><a href="http://www.w3.org/TR/html5/webappapis.html#incumbent-settings-object">incumbent settings object</a>
17831762
<li><a href="http://www.w3.org/TR/html5/document-metadata.html#the-meta-element">meta</a>
17841763
<li><a href="http://www.w3.org/TR/html5/browsers.html#nested-browsing-context">nested browsing context</a>
17851764
<li><a href="http://www.w3.org/TR/html5/browsers.html#browsing-context-nested-through">nested through</a>
1765+
<li><a href="http://www.w3.org/TR/html5/browsers.html#parent-browsing-context">parent browsing context</a>
17861766
<li><a href="http://www.w3.org/TR/html5/infrastructure.html#plugin">plugin</a>
17871767
<li><a href="http://www.w3.org/TR/html5/webappapis.html#relevant-settings-object-for-a-script">relevant settings object for a script</a>
17881768
<li><a href="http://www.w3.org/TR/html5/webappapis.html#responsible-browsing-context">responsible browsing context</a>
@@ -1838,6 +1818,9 @@ <h3 class="no-num heading settled" id="informative"><span class="content">Inform
18381818
<dd>Tim Bray; et al. <a href="http://www.w3.org/TR/xml">Extensible Markup Language (XML) 1.0 (Fifth Edition)</a>. 26 November 2008. REC. URL: <a href="http://www.w3.org/TR/xml">http://www.w3.org/TR/xml</a></dl>
18391819
<h2 class="no-num heading settled" id="issues-index"><span class="content">Issues Index</span><a class="self-link" href="#issues-index"></a></h2>
18401820
<div style="counter-reset:issue">
1841-
<div class="issue"> Is this right, Anne?<a href="#issue-cb07f5b7"> ↵ </a></div>
1821+
<div class="issue"> This doesn’t yet work correctly for content inside an
1822+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">iframe</a></code> or <code><a data-link-type="element" href="http://www.w3.org/TR/html5/obsolete.html#frame">frame</a></code>.<a href="#issue-58787eb8"> ↵ </a></div>
1823+
<div class="issue"> This doesn’t yet work correctly for content inside an
1824+
<code><a data-link-type="element" href="http://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">iframe</a></code> or <code><a data-link-type="element" href="http://www.w3.org/TR/html5/obsolete.html#frame">frame</a></code>.<a href="#issue-58787eb80"> ↵ </a></div>
18421825
<div class="issue"> This is super hand-wavey.<a href="#issue-3280c348"> ↵ </a></div></div></body>
18431826
</html>

0 commit comments

Comments
 (0)