diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /net/base/net_error_list.h | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'net/base/net_error_list.h')
| -rw-r--r-- | net/base/net_error_list.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index 96b19ad..bc7065d 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -191,7 +191,9 @@ NET_ERROR(SSL_SNAP_START_NPN_MISPREDICTION, -131) // give the user a helpful error message rather than have the connection hang. NET_ERROR(ESET_ANTI_VIRUS_SSL_INTERCEPTION, -132) -// Missing -133. Feel free to reuse in the future. +// We've hit the max socket limit for the socket pool while preconnecting. We +// don't bother trying to preconnect more sockets. +NET_ERROR(PRECONNECT_MAX_SOCKET_LIMIT, -133) // The permission to use the SSL client certificate's private key was denied. NET_ERROR(SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED, -134) @@ -210,6 +212,9 @@ NET_ERROR(NAME_RESOLUTION_FAILED, -137) // errors. See also ERR_ACCESS_DENIED. NET_ERROR(NETWORK_ACCESS_DENIED, -138) +// The request throttler module cancelled this request to avoid DDOS. +NET_ERROR(TEMPORARILY_THROTTLED, -139) + // Certificate error codes // // The values of certificate error codes must be consecutive. @@ -421,6 +426,10 @@ NET_ERROR(RESPONSE_BODY_TOO_BIG_TO_DRAIN, -345) // The HTTP response was too big to drain. NET_ERROR(RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH, -346) +// SPDY Headers have been received, but not all of them - status or version +// headers are missing, so we're expecting additional frames to complete them. +NET_ERROR(INCOMPLETE_SPDY_HEADERS, -347) + // The cache does not have the requested entry. NET_ERROR(CACHE_MISS, -400) |