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.

Sign up for GitHub

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

Jump to bottom

Correct the default of allowRunningInsecureContent as per docs #12556

Merged
merged 3 commits into from
Apr 16, 2018
Merged

Correct the default of allowRunningInsecureContent as per docs #12556

merged 3 commits into from
Apr 16, 2018

Conversation

MarshallOfSound
Copy link
Member

Fixes #12555

@MarshallOfSound MarshallOfSound requested review from ckerr and a team April 6, 2018 15:40
poiru
poiru reviewed Apr 6, 2018
View reviewed changes
atom/browser/web_contents_preferences.cc Outdated
SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
bool webSecurity = true;
SetDefaultBoolIfUndefined("webSecurity", webSecurity);
// If webSecurity was explicity set to false, let's inherit that into insureContent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo insure

@codebytere
Copy link
Member

Failing on

../../atom/browser/web_contents_preferences.cc:71:23: error: no member named 'GetBoolean' in 'mate::Dictionary'
  if (web_preferences.GetBoolean("webSecurity", &webSecurity) && !webSecurity) {
      ~~~~~~~~~~~~~~~ ^

ckerr
ckerr approved these changes Apr 16, 2018
View reviewed changes
Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ckerr ckerr merged commit d06c79f into master Apr 16, 2018
@trop
Copy link
Contributor

trop bot commented Apr 16, 2018

An error occurred while attempting to backport this PR to "1-7-x", you will need to perform this backport manually

@trop trop bot mentioned this pull request Apr 16, 2018
Merged
@trop
Copy link
Contributor

trop bot commented Apr 16, 2018

We have automatically backported this PR to "2-0-x", please check out #12629

@trop trop bot added merged/2-0-x and removed target/2-0-x labels Apr 16, 2018
@trop trop bot mentioned this pull request Apr 16, 2018
Merged
@trop
Copy link
Contributor

trop bot commented Apr 16, 2018

We have automatically backported this PR to "1-8-x", please check out #12630

@trop trop bot added merged/1-8-x and removed target/1-8-x labels Apr 16, 2018
@ckerr ckerr deleted the insecure-default branch April 16, 2018 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@poiru poiru poiru left review comments

@ckerr ckerr ckerr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MarshallOfSound @codebytere @ckerr @poiru