diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 15:27:55 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 15:27:55 +0000 |
| commit | b05e0ac05876e626cc85d3a59e5b8dc2b1a6d9c0 (patch) | |
| tree | e9e14b819719d8a1226f8d08195d69da314d06ad /chrome | |
| parent | ad0acc68a5ae79ace062eee99475aa2edb187c4e (diff) | |
| download | chromium_src-b05e0ac05876e626cc85d3a59e5b8dc2b1a6d9c0.zip chromium_src-b05e0ac05876e626cc85d3a59e5b8dc2b1a6d9c0.tar.gz chromium_src-b05e0ac05876e626cc85d3a59e5b8dc2b1a6d9c0.tar.bz2 | |
Handle unexpected connection close during SSL handshake on Mac
SSLHandlshake may return errSSLClosedGraceful error code which is
interpreted as net::OK by NetErrorFromOSStatus, but the caller code
sometimes do not check status!=noErr cases if net_error==OK,
and this can lead unexpected status in the handshake sequence
(and causes ExtensionApiTest.CrossOriginXHR failure on Mac).
BUG=29711
TEST=ExtensionApiTest.CrossOriginXHR
Review URL: http://codereview.chromium.org/500018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/cross_origin_xhr_apitest.cc | 9 |
1 files changed, 1 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_; |