Repository: trafficserver Updated Branches: refs/heads/6.0.x 7f645eca6 -> 151489507
TS-3902: Wrong conditional for checking on continuation frame and to send the go_away frame (cherry picked from commit 4bfe746778f2c127501d2682a6466694be5873d9) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/15148950 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/15148950 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/15148950 Branch: refs/heads/6.0.x Commit: 1514895070fd898d7c30c6f0f0f687f4231956b0 Parents: 7f645ec Author: Bryan Call <[email protected]> Authored: Thu Sep 10 13:50:49 2015 -0700 Committer: Bryan Call <[email protected]> Committed: Thu Sep 10 14:16:47 2015 -0700 ---------------------------------------------------------------------- proxy/http2/Http2ClientSession.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15148950/proxy/http2/Http2ClientSession.cc ---------------------------------------------------------------------- diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc index 2cb83d7..b02f983 100644 --- a/proxy/http2/Http2ClientSession.cc +++ b/proxy/http2/Http2ClientSession.cc @@ -363,7 +363,7 @@ Http2ClientSession::state_start_frame_read(int event, void *edata) if (continued_stream_id != 0 && this->current_hdr.type != HTTP2_FRAME_TYPE_CONTINUATION) { SCOPED_MUTEX_LOCK(lock, this->connection_state.mutex, this_ethread()); - if (!this->connection_state.is_state_closed() || continued_stream_id != this->current_hdr.streamid) { + if (!this->connection_state.is_state_closed() && continued_stream_id != this->current_hdr.streamid) { this->connection_state.send_goaway_frame(this->current_hdr.streamid, HTTP2_ERROR_PROTOCOL_ERROR); } return 0;
