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

Unified Diff: net/http/http_proxy_client_socket_pool_spdy3_unittest.cc

Issue 16599019: Merge 202927 "net: don't process truncated headers on HTTPS conn..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 6 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 | « net/http/http_proxy_client_socket_pool_spdy2_unittest.cc ('k') | net/http/http_stream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket_pool_spdy3_unittest.cc
===================================================================
--- net/http/http_proxy_client_socket_pool_spdy3_unittest.cc (revision 205381)
+++ net/http/http_proxy_client_socket_pool_spdy3_unittest.cc (working copy)
@@ -475,7 +475,13 @@
EXPECT_FALSE(handle_.socket());
data_->RunFor(3);
- EXPECT_EQ(ERR_CONNECTION_CLOSED, callback_.WaitForResult());
+ if (GetParam() == SPDY) {
+ // SPDY cannot process a headers block unless it's complete and so it
+ // returns ERR_CONNECTION_CLOSED in this case.
+ EXPECT_EQ(ERR_CONNECTION_CLOSED, callback_.WaitForResult());
+ } else {
+ EXPECT_EQ(ERR_HEADERS_TRUNCATED, callback_.WaitForResult());
+ }
EXPECT_FALSE(handle_.is_initialized());
EXPECT_FALSE(handle_.socket());
}
« no previous file with comments | « net/http/http_proxy_client_socket_pool_spdy2_unittest.cc ('k') | net/http/http_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698