diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 08:22:53 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 08:22:53 +0000 |
| commit | f2da6ac99be9bac06929de7e645ec5dce86b3a5e (patch) | |
| tree | 9183bf4603f2aa7eb6bea48c92b4009d15c4ec95 /chrome/browser/net/websocket_browsertest.cc | |
| parent | a0b841788ac7ae2d1dfb3f09021d3e852050a1f8 (diff) | |
| download | chromium_src-f2da6ac99be9bac06929de7e645ec5dce86b3a5e.zip chromium_src-f2da6ac99be9bac06929de7e645ec5dce86b3a5e.tar.gz chromium_src-f2da6ac99be9bac06929de7e645ec5dce86b3a5e.tar.bz2 | |
SSLClientSocket::IsConnected should care for internal buffers (OpenSSL)
SSLClientSocket::IsConnected() and SSLClientSocket::IsConnectedAndIdle()
may return false though it has buffered data. They should care for internally
processing buffer.
The bug on NSS was already fixed. This CL will fix the issue on OpenSSL
used by Android, and others with GYP_DEFINES="use_openssl=1".
BUG=160033
TEST=browser_tests with use_openssl=1, or try on linux_redux
Review URL: https://codereview.chromium.org/11827022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/websocket_browsertest.cc')
| -rw-r--r-- | chrome/browser/net/websocket_browsertest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 615bcc0..79ff11a 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -60,17 +60,9 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketSplitSegments) { EXPECT_TRUE(EqualsASCII(result, "PASS")); } -#if defined(USE_OPENSSL) -// TODO(toyoshim): Enable this test for OpenSSL once http://crbug.com/160033 -// is fixed against OpenSSL. -#define MAYBE_SecureWebSocketSplitRecords DISABLED_SecureWebSocketSplitRecords -#else -#define MAYBE_SecureWebSocketSplitRecords SecureWebSocketSplitRecords -#endif // Test that the browser can handle a WebSocket frame split into multiple SSL // records. -IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, - MAYBE_SecureWebSocketSplitRecords) { +IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SecureWebSocketSplitRecords) { // Launch a secure WebSocket server. ASSERT_TRUE(wss_server_.Start()); |