diff options
| -rw-r--r-- | chrome/browser/extensions/cross_origin_xhr_apitest.cc | 9 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_mac.cc | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc index efe7de1..5a98322 100644 --- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc +++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc @@ -4,14 +4,7 @@ #include "chrome/browser/extensions/extension_apitest.h" -#if defined(OS_MACOSX) -// http://crbug.com/29711 -#define MAYBE_CrossOriginXHR DISABLED_CrossOriginXHR -#else -#define MAYBE_CrossOriginXHR CrossOriginXHR -#endif - -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CrossOriginXHR) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHR) { host_resolver()->AddRule("*.com", "127.0.0.1"); StartHTTPServer(); ASSERT_TRUE(RunExtensionTest("cross_origin_xhr")) << message_; diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc index 3aa3591d..1bf68a0 100644 --- a/net/socket/ssl_client_socket_mac.cc +++ b/net/socket/ssl_client_socket_mac.cc @@ -710,6 +710,10 @@ int SSLClientSocketMac::DoHandshakeStart() { } } + if (status == errSSLClosedGraceful) + // The server unexpectedly closed on us. + return ERR_UNEXPECTED; + int net_error = NetErrorFromOSStatus(status); if (status == noErr || IsCertificateError(net_error)) { server_cert_ = GetServerCert(ssl_context_); @@ -765,6 +769,9 @@ int SSLClientSocketMac::DoHandshakeFinish() { if (status == errSSLWouldBlock) next_handshake_state_ = STATE_HANDSHAKE_FINISH; + if (status == errSSLClosedGraceful) + return ERR_UNEXPECTED; + if (status == noErr) { completed_handshake_ = true; DCHECK(next_handshake_state_ == STATE_NONE); |