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

Commit e13a28e

Browse files
committed
Merge pull request #9727 from brave/fix/9652
Send isSecure false instead of null when an insecure site has passive mixed content
1 parent d9ff069 commit e13a28e

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
@@ -710,12 +710,11 @@ class Frame extends React.Component {
710710
isSecure = false
711711
const parsedUrl = urlParse(this.props.location)
712712
ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
713-
} else if (this.props.isSecure !== false &&
714-
['warning', 'passive-mixed-content'].includes(e.securityState)) {
713+
} else if (['warning', 'passive-mixed-content'].includes(e.securityState)) {
715714
// Passive mixed content should not upgrade an insecure connection to a
716715
// partially-secure connection. It can only downgrade a secure
717716
// connection.
718-
isSecure = 1
717+
isSecure = this.props.isSecure !== false ? 1 : false
719718
}
720719
windowActions.setSecurityState(this.frame, {
721720
secure: runInsecureContent ? false : isSecure,

0 commit comments

Comments
 (0)