diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/base/net_errors.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/base/net_errors.h')
| -rw-r--r-- | chromium/net/base/net_errors.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/net/base/net_errors.h b/chromium/net/base/net_errors.h index 21749d8b76b..34e355e1104 100644 --- a/chromium/net/base/net_errors.h +++ b/chromium/net/base/net_errors.h @@ -36,7 +36,9 @@ NET_EXPORT const char* ErrorToString(int error); inline bool IsCertificateError(int error) { // Certificate errors are negative integers from net::ERR_CERT_BEGIN // (inclusive) to net::ERR_CERT_END (exclusive) in *decreasing* order. - return error <= ERR_CERT_BEGIN && error > ERR_CERT_END; + return (error <= ERR_CERT_BEGIN && error > ERR_CERT_END) || + (error == ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY) || + (error == ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN); } // Map system error code to Error. |