diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-23 12:44:25 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-23 12:44:25 +0100 |
| commit | 71119b4926181014e35094de9b8c48ed87be446c (patch) | |
| tree | b9173bed0fdfecda92ff92068154a96fb7b012ef /xpcom | |
| parent | b884cfd05e35ba96f26a864408d9cd67b913a13b (diff) | |
| parent | 0fca15e1f3b24fb5bac76edb1ad0f057ad07851d (diff) | |
| download | uxp-71119b4926181014e35094de9b8c48ed87be446c.tar.gz | |
Merge branch 'security_tls_1-3_1' into TLS-1.3
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/base/ErrorList.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/xpcom/base/ErrorList.h b/xpcom/base/ErrorList.h index cfa461fe40..5ab4bfa297 100644 --- a/xpcom/base/ErrorList.h +++ b/xpcom/base/ErrorList.h @@ -327,13 +327,15 @@ ERROR(NS_NET_STATUS_WRITING, FAILURE(9)), /* nsISocketTransport */ - ERROR(NS_NET_STATUS_RESOLVING_HOST, FAILURE(3)), - ERROR(NS_NET_STATUS_RESOLVED_HOST, FAILURE(11)), - ERROR(NS_NET_STATUS_CONNECTING_TO, FAILURE(7)), - ERROR(NS_NET_STATUS_CONNECTED_TO, FAILURE(4)), - ERROR(NS_NET_STATUS_SENDING_TO, FAILURE(5)), - ERROR(NS_NET_STATUS_WAITING_FOR, FAILURE(10)), - ERROR(NS_NET_STATUS_RECEIVING_FROM, FAILURE(6)), + ERROR(NS_NET_STATUS_RESOLVING_HOST, FAILURE(3)), + ERROR(NS_NET_STATUS_RESOLVED_HOST, FAILURE(11)), + ERROR(NS_NET_STATUS_CONNECTING_TO, FAILURE(7)), + ERROR(NS_NET_STATUS_CONNECTED_TO, FAILURE(4)), + ERROR(NS_NET_STATUS_TLS_HANDSHAKE_STARTING, FAILURE(12)), + ERROR(NS_NET_STATUS_TLS_HANDSHAKE_ENDED, FAILURE(13)), + ERROR(NS_NET_STATUS_SENDING_TO, FAILURE(5)), + ERROR(NS_NET_STATUS_WAITING_FOR, FAILURE(10)), + ERROR(NS_NET_STATUS_RECEIVING_FROM, FAILURE(6)), /* nsIInterceptedChannel */ /* Generic error for non-specific failures during service worker interception */ |