diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-09-07 01:37:02 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-09-07 01:37:02 +0100 |
| commit | 9041d9254ee491df60a35237febf71089bf082ff (patch) | |
| tree | 20ecbb1fe84116942500bd9ddfee78916d2fb239 /core/java/android/webkit/BrowserFrame.java | |
| parent | 1d124d5037644ed66a78c181c4eff13a7da04443 (diff) | |
Fix for bug 5100096 Repeated Security Waring
Only giving the host to SslError.
Change-Id: I6112643cf25293348ff20193e67da5f52063ffa2
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index f89d490f9ef5..49b4f66485e7 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -43,6 +43,7 @@ import junit.framework.Assert; import java.io.IOException; import java.io.InputStream; import java.lang.ref.WeakReference; +import java.net.URL; import java.net.URLEncoder; import java.nio.charset.Charsets; import java.security.PrivateKey; @@ -1171,7 +1172,8 @@ class BrowserFrame extends Handler { X509Certificate cert = new X509CertImpl(cert_der); SslCertificate sslCert = new SslCertificate(cert); if (JniUtil.useChromiumHttpStack()) { - ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert, url); + ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert, + new URL(url).getHost()); } else { ssl_error = new SslError(cert_error, cert, url); } |