| Index: net/spdy/spdy_framer.cc
|
| diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
|
| index a20d1ead1f83b1c433bddd0ce9ffe2b2a29db05b..3d9994013171b787a6bccba0d1e64144b62baecb 100644
|
| --- a/net/spdy/spdy_framer.cc
|
| +++ b/net/spdy/spdy_framer.cc
|
| @@ -2407,12 +2407,8 @@ SpdySerializedFrame* SpdyFramer::SerializeHeaders(
|
| flags |= CONTROL_FLAG_FIN;
|
| }
|
| if (protocol_version() > SPDY3) {
|
| - // TODO(mlavan): If we overflow into a CONTINUATION frame, this will
|
| - // get overwritten below, so we should probably just get rid of the
|
| - // end_headers field.
|
| - if (headers.end_headers()) {
|
| - flags |= HEADERS_FLAG_END_HEADERS;
|
| - }
|
| + // This will get overwritten if we overflow into a CONTINUATION frame.
|
| + flags |= HEADERS_FLAG_END_HEADERS;
|
| if (headers.has_priority()) {
|
| flags |= HEADERS_FLAG_PRIORITY;
|
| }
|
| @@ -2518,12 +2514,8 @@ SpdyFrame* SpdyFramer::SerializePushPromise(
|
| const SpdyPushPromiseIR& push_promise) {
|
| DCHECK_LT(SPDY3, protocol_version());
|
| uint8 flags = 0;
|
| - // TODO(mlavan): If we overflow into a CONTINUATION frame, this will
|
| - // get overwritten below, so we should probably just get rid of the
|
| - // end_push_promise field.
|
| - if (push_promise.end_push_promise()) {
|
| - flags |= PUSH_PROMISE_FLAG_END_PUSH_PROMISE;
|
| - }
|
| + // This will get overwritten if we overflow into a CONTINUATION frame.
|
| + flags |= PUSH_PROMISE_FLAG_END_PUSH_PROMISE;
|
| // The size of this frame, including variable-length name-value block.
|
| size_t size = GetPushPromiseMinimumSize();
|
|
|
|
|