diff options
| author | xunjieli <xunjieli@chromium.org> | 2016-03-11 16:17:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 00:18:48 +0000 |
| commit | 188bd40f723812b8a718195fdc5af274c21891e4 (patch) | |
| tree | 4ccb2f07c9a8cf78b3bcdde27e4ac7b1dcbd485a /net/tools/quic/test_tools/quic_test_client.cc | |
| parent | 8c5ee7703eed1efa0a5f1bd532c3ac9c7f8e9242 (diff) | |
| download | chromium_src-188bd40f723812b8a718195fdc5af274c21891e4.zip chromium_src-188bd40f723812b8a718195fdc5af274c21891e4.tar.gz chromium_src-188bd40f723812b8a718195fdc5af274c21891e4.tar.bz2 | |
Only MarkTrailersConsumed when actually sending trailers notification
MarkTrailersConsumed is currently done before the
notification is posted asynchronously. However, there might
be a pending read before that notification is executed but
after MarkTrailersConsumed, which leads to delegate
mistakenly to assume that the trailers are consumed.
This CL changes so that we MarkTrailersConsumed when we
actually will immediately notify delegate.
This CL also patches some internal trailers changes in
quic_spdy_stream.cc and quic_spdy_client_stream.cc.
BUG=586207
Review URL: https://codereview.chromium.org/1776423004
Cr-Commit-Position: refs/heads/master@{#380799}
Diffstat (limited to 'net/tools/quic/test_tools/quic_test_client.cc')
| -rw-r--r-- | net/tools/quic/test_tools/quic_test_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc index e926279a..fad3ab9 100644 --- a/net/tools/quic/test_tools/quic_test_client.cc +++ b/net/tools/quic/test_tools/quic_test_client.cc @@ -568,7 +568,7 @@ void QuicTestClient::OnClose(QuicSpdyStream* stream) { response_complete_ = true; response_headers_complete_ = stream_->headers_decompressed(); SpdyBalsaUtils::SpdyHeadersToResponseHeaders(stream_->headers(), &headers_); - response_trailers_ = stream_->trailers(); + response_trailers_ = stream_->response_trailers(); stream_error_ = stream_->stream_error(); bytes_read_ = stream_->stream_bytes_read() + stream_->header_bytes_read(); bytes_written_ = |