diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:53:21 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:53:21 +0000 |
| commit | c92f4b4541bbe727a5c9b333171e1a58bab89773 (patch) | |
| tree | e3f86fa38f5453ab48db72a2eddfed23bad82285 /net/http | |
| parent | 84d8904f31c411d102d50698bad7dfdfcc671978 (diff) | |
| download | chromium_src-c92f4b4541bbe727a5c9b333171e1a58bab89773.zip chromium_src-c92f4b4541bbe727a5c9b333171e1a58bab89773.tar.gz chromium_src-c92f4b4541bbe727a5c9b333171e1a58bab89773.tar.bz2 | |
Instead of enqueueing SPDY frames, enqueue SPDY streams that are ready to produce data. This allows us to lazily allocate a stream id.
The second CL was reverted because of use-after-free problems. Producers were deleted before they were pop()'d from the WriteQueue, which turns out to be a no-no. This version fixes this defect.
The initial CL was reverted because of memory leaks. Both SpdyIOBufferProducers leaked the SpdyFrame they owned. The second version of the CL fixes this defect.
Attempting to re-land 144649
Revert 147692 - Revert 144655 - Revert 144649
BUG=111708
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/10815074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction_spdy2_unittest.cc | 4 | ||||
| -rw-r--r-- | net/http/http_network_transaction_spdy3_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 07e91425..7c10eb0 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -4939,8 +4939,8 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthSpdyProxy) { MockWrite spdy_writes[] = { CreateMockWrite(*req, 1, ASYNC), - CreateMockWrite(*connect2, 4), - CreateMockWrite(*rst, 5, ASYNC), + CreateMockWrite(*rst, 4, ASYNC), + CreateMockWrite(*connect2, 5), CreateMockWrite(*wrapped_get, 8), }; diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 0f665e8..7ccddeb 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -4939,8 +4939,8 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { MockWrite spdy_writes[] = { CreateMockWrite(*req, 1, ASYNC), - CreateMockWrite(*connect2, 4), - CreateMockWrite(*rst, 5, ASYNC), + CreateMockWrite(*rst, 4, ASYNC), + CreateMockWrite(*connect2, 5), CreateMockWrite(*wrapped_get, 8) }; |