diff options
| author | Chris Barry <[email protected]> | 2015-09-28 22:12:57 -0400 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-10-23 22:22:57 -0700 |
| commit | 9aeec56745fde5db4ce0c1992bc1c5a9c70ea9c8 (patch) | |
| tree | ed08f613dd9cd565d4eb5ff343d918a3c68c6e36 | |
| parent | 18ad53fc5662e0739a32f86d8dcbfbf5bd5b260a (diff) | |
| download | bootstrap-9aeec56745fde5db4ce0c1992bc1c5a9c70ea9c8.tar.xz bootstrap-9aeec56745fde5db4ce0c1992bc1c5a9c70ea9c8.zip | |
Adding subresource hashes to CDN links.
In Firefox 43 and Chrome 45 there will be support for Subresource
Iintegrity (SRI). More information here:
https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity
Closes #17729 by merging a tweaked version of it.
| -rw-r--r-- | _config.yml | 4 | ||||
| -rw-r--r-- | docs/_includes/getting-started/download.html | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/_config.yml b/_config.yml index 1ee942284..39abfb7fd 100644 --- a/_config.yml +++ b/_config.yml @@ -27,6 +27,10 @@ blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com cdn: + # See https://www.srihash.org for info on how to generate the hashes css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css + css_hash: "sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css + css_theme_hash: "sha384-aUGj/X2zp5rLCbBxumKTCw2Z50WgIr1vs/PFN4praOTvYXWlVyh2UtNUU0KAUhAX" js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js + js_hash: "sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index bc25122bd..1fb3aab61 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -31,13 +31,13 @@ <p>The folks over at <a href="https://www.maxcdn.com/">MaxCDN</a> graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these <a href="https://www.bootstrapcdn.com/">Bootstrap CDN</a> links.</p> {% highlight html %} <!-- Latest compiled and minified CSS --> -<link rel="stylesheet" href="{{ site.cdn.css }}"> +<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous"> <!-- Optional theme --> -<link rel="stylesheet" href="{{ site.cdn.css_theme }}"> +<link rel="stylesheet" href="{{ site.cdn.css_theme }}" integrity="{{ site.cdn.css_theme_hash }}" crossorigin="anonymous"> <!-- Latest compiled and minified JavaScript --> -<script src="{{ site.cdn.js }}"></script> +<script src="{{ site.cdn.js }}" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script> {% endhighlight %} <h2 id="download-bower">Install with Bower</h2> |