github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use HTTPS in Meteor.absoluteUrl by default if window.location uses HTTPS.

Browse Source 
Another attempt to fix #9879.
This commit is contained in:
Ben Newman
2018-05-12 10:50:16 -04:00
parent 9bf35f60d2
commit dacedda571
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/meteor/url_common.js
View File

@@ -44,11 +44,22 @@ Meteor.absoluteUrl = function (path, options) {
};
// allow later packages to override default options
Meteor.absoluteUrl.defaultOptions = { };
var defaultOptions = Meteor.absoluteUrl.defaultOptions = {};
// available only in a browser environment
var location = typeof window === "object" && window.location;
if (typeof __meteor_runtime_config__ === "object" &&
__meteor_runtime_config__.ROOT_URL)
Meteor.absoluteUrl.defaultOptions.rootUrl = __meteor_runtime_config__.ROOT_URL;
// Make absolute URLs use HTTPS by default if the current window.location
// uses HTTPS. Since this is just a default, it can be overridden by
// passing { secure: false } if necessary.
if (location &&
location.protocol === "https:") {
defaultOptions.secure = true;
}
Meteor._relativeToSiteRootUrl = function (link) {
if (typeof __meteor_runtime_config__ === "object" &&