summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 04:37:22 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 04:37:22 +0000
commit61832ecbfeaba39f4dfa95ca7678e645fbee6ea4 (patch)
treef35e175eb464bd3affc495277117885896a3d7f9 /net
parent0fefd0206fc58c2908f299261a2e3f665266629e (diff)
downloadchromium_src-61832ecbfeaba39f4dfa95ca7678e645fbee6ea4.zip
chromium_src-61832ecbfeaba39f4dfa95ca7678e645fbee6ea4.tar.gz
chromium_src-61832ecbfeaba39f4dfa95ca7678e645fbee6ea4.tar.bz2
Fix SSL error code for unexpected errSSLClosedGraceful on Mac
Fixing error code and style issues in http://codereview.chromium.org/500018 BUG=29711 TEST=ExtensionApiTest.CrossOriginXHR Review URL: http://codereview.chromium.org/503038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/ssl_client_socket_mac.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index 492a675..4bc6ae8 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -709,9 +709,10 @@ int SSLClientSocketMac::DoHandshakeStart() {
}
}
- if (status == errSSLClosedGraceful)
+ if (status == errSSLClosedGraceful) {
// The server unexpectedly closed on us.
- return ERR_UNEXPECTED;
+ return ERR_SSL_PROTOCOL_ERROR;
+ }
int net_error = NetErrorFromOSStatus(status);
if (status == noErr || IsCertificateError(net_error)) {
@@ -769,7 +770,7 @@ int SSLClientSocketMac::DoHandshakeFinish() {
next_handshake_state_ = STATE_HANDSHAKE_FINISH;
if (status == errSSLClosedGraceful)
- return ERR_UNEXPECTED;
+ return ERR_SSL_PROTOCOL_ERROR;
if (status == noErr) {
completed_handshake_ = true;