Skip to content

Commit

Permalink
UPGRADE: Clarify 'depending on' the upgrade mechanism.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikewest committed Apr 24, 2015
1 parent 382b5a8 commit 7deb537
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions specs/upgrade/index.src.html
Original file line number Diff line number Diff line change
Expand Up @@ -446,17 +446,18 @@ <h2 id="key-concepts">Key Concepts and Terminology</h2>

: <dfn export local-lt="safely upgradable">safely upgradable requests</dfn>
:: A {{Request}} is said to be <strong>safely upgradable</strong> if the
<a>resource representation</a> which will be returned does not depend on
the <code><a>upgrade-insecure-requests</a></code> mechanism described in
this document, or if the {{Request}}'s {{Request/header-list}} contains an
<code><a>HTTPS</a></code> header field with a value of <code>1</code>.
<a>resource representation</a> which will be returned does not require the
<code><a>upgrade-insecure-requests</a></code> mechanism described in this
document to avoid breakage, or if the {{Request}}'s
{{Request/header-list}} contains an <code><a>HTTPS</a></code> header field
with a value of <code>1</code>.

: <dfn export local-lt="HSTS-safe">HSTS-safe origin</dfn>
:: An <a>origin</a> is said to be <strong>HSTS-safe</strong> if no
<a>resource representations</a> it returns depend on the
<a>resource representations</a> it returns requires the the
<code><a>upgrade-insecure-requests</a></code> mechanism described in
this document, and if all <a>resource representations</a> it returns
can be served over HTTPS.
this document to avoid breakage, and if all <a>resource representations</a>
it returns can be served over HTTPS.

<a>HSTS-safe origins</a> can safely opt-into
<code><a>Strict-Transport-Security</a></code> for all user agents,
Expand All @@ -465,10 +466,10 @@ <h2 id="key-concepts">Key Concepts and Terminology</h2>

: <dfn export local-lt="conditionally HSTS-safe">conditionally HSTS-safe origin</dfn>
:: An <a>origin</a> is said to be <strong>conditionally HSTS-safe</strong>
if one or more <a>resource representations</a> it returns depend on the
if one or more <a>resource representations</a> it returns requires the
<code><a>upgrade-insecure-requests</a></code> mechanism described in
this document, and if all <a>resource representations</a> it returns
can be served over HTTPS.
this document to avoid breakage, and if all <a>resource representations</a> it
returns can be served over HTTPS.

<a>Conditionally HSTS-safe origins</a> can safely opt-into
<code><a>Strict-Transport-Security</a></code> only for user agents which
Expand Down

0 comments on commit 7deb537

Please sign in to comment.