Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 12468002: Report the correct os_error in the SOCKET_READ_ERROR event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove a potentially misleading comment. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/socket/tcp_client_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
===================================================================
--- net/socket/ssl_client_socket_nss.cc (revision 187920)
+++ net/socket/ssl_client_socket_nss.cc (working copy)
@@ -1904,19 +1904,15 @@
// inject TCP reset packets to break the connections when they see
// TLS 1.1 in ClientHello or ServerHello. See http://crbug.com/130293.
//
- // Only allow ERR_CONNECTION_RESET/ABORTED to trigger a TLS 1.1 -> TLS 1.0
- // fallback. We don't lose much in this fallback because the explicit IV
- // for CBC mode in TLS 1.1 is approximated by record splitting in TLS 1.0.
+ // Only allow ERR_CONNECTION_RESET to trigger a TLS 1.1 -> TLS 1.0
+ // fallback. We don't lose much in this fallback because the explicit
+ // IV for CBC mode in TLS 1.1 is approximated by record splitting in
+ // TLS 1.0.
//
- // ERR_CONNECTION_RESET/ABORTED are common network errors, so we don't want
- // them to trigger a version fallback in general, especially the TLS 1.0 ->
+ // ERR_CONNECTION_RESET is a common network error, so we don't want it
+ // to trigger a version fallback in general, especially the TLS 1.0 ->
// SSL 3.0 fallback, which would drop TLS extensions.
- //
- // ERR_CONNECTION_ABORTED was added because we get this error message when
- // using non-blocking reads instead of async/overlapped reads. See
- // crbug.com/178672.
- if ((prerr == PR_CONNECT_RESET_ERROR ||
- prerr == PR_CONNECT_ABORTED_ERROR) &&
+ if (prerr == PR_CONNECT_RESET_ERROR &&
ssl_config_.version_max == SSL_PROTOCOL_VERSION_TLS1_1) {
net_error = ERR_SSL_PROTOCOL_ERROR;
}
« no previous file with comments | « no previous file | net/socket/tcp_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698