Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cookie store _secureCookies: use correct protocol property in FastBoot mode #1104

Merged
merged 1 commit into from
Nov 24, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addon/session-stores/cookie.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ export default BaseStore.extend({

_secureCookies: computed(function() {
if (this.get('_fastboot.isFastBoot')) {
return this.get('_fastboot.request.host').indexOf('https:') === 0;
} else {
return window.location.protocol === 'https:';
return this.get('_fastboot.request.protocol') === 'https';
}

return window.location.protocol === 'https:';
}).volatile(),

_syncDataTimeout: null,
Expand Down