Merge pull request #9727 from brave/fix/9652

Send isSecure false instead of null when an insecure site has passive mixed content
brave · Jun 27, 2017 · e13a28e · e13a28e
1 parent d9ff069
commit e13a28e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
@@ -710,12 +710,11 @@ class Frame extends React.Component {
         isSecure = false
         const parsedUrl = urlParse(this.props.location)
         ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
-      } else if (this.props.isSecure !== false &&
-        ['warning', 'passive-mixed-content'].includes(e.securityState)) {
+      } else if (['warning', 'passive-mixed-content'].includes(e.securityState)) {
         // Passive mixed content should not upgrade an insecure connection to a
         // partially-secure connection. It can only downgrade a secure
         // connection.
-        isSecure = 1
+        isSecure = this.props.isSecure !== false ? 1 : false
       }
       windowActions.setSecurityState(this.frame, {
         secure: runInsecureContent ? false : isSecure,