summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 01:51:12 +0000
committererikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 01:51:12 +0000
commit0d384bbe81478e3b029ed248faae00175409f3ec (patch)
tree4a7f13806743347f3f645dcf2e27989e4a2f8223
parent8cd62f61b53e532b829b986326755404bbcaf6ad (diff)
downloadchromium_src-0d384bbe81478e3b029ed248faae00175409f3ec.zip
chromium_src-0d384bbe81478e3b029ed248faae00175409f3ec.tar.gz
chromium_src-0d384bbe81478e3b029ed248faae00175409f3ec.tar.bz2
SPDY incorrectly DCHECKed that the SYN_REPLY headers could never be an empty list.
TEST=net_unittests BUG=47991 Review URL: http://codereview.chromium.org/2987002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52264 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc2
-rw-r--r--net/spdy/spdy_stream.cc1
2 files changed, 2 insertions, 1 deletions
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 7f48a60..5235427 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -847,6 +847,8 @@ TEST_F(SpdyNetworkTransactionTest, InvalidSynReply) {
NULL
},
},
+ // SYN_REPLY with no headers
+ { 0, { NULL }, },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 1166cd5..3d68d5d 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -87,7 +87,6 @@ int SpdyStream::OnResponseReceived(const spdy::SpdyHeaderBlock& response) {
DCHECK(response_->empty());
*response_ = response; // TODO(ukai): avoid copy.
- DCHECK(!response_->empty());
recv_first_byte_time_ = base::TimeTicks::Now();
response_time_ = base::Time::Now();