Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 13984b0

Browse files
authored
Merge pull request #9727 from brave/fix/9652
Send isSecure false instead of null when an insecure site has passive mixed content
2 parents d142b24 + 3935f58 commit 13984b0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

app/renderer/components/frame/frame.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -707,12 +707,11 @@ class Frame extends React.Component {
707707
isSecure = false
708708
const parsedUrl = urlParse(this.props.location)
709709
ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
710-
} else if (this.props.isSecure !== false &&
711-
['warning', 'passive-mixed-content'].includes(e.securityState)) {
710+
} else if (['warning', 'passive-mixed-content'].includes(e.securityState)) {
712711
// Passive mixed content should not upgrade an insecure connection to a
713712
// partially-secure connection. It can only downgrade a secure
714713
// connection.
715-
isSecure = 1
714+
isSecure = this.props.isSecure !== false ? 1 : false
716715
}
717716
windowActions.setSecurityState(this.frame, {
718717
secure: runInsecureContent ? false : isSecure,

0 commit comments

Comments
 (0)