Repository: trafficserver Updated Branches: refs/heads/master a12b6d29a -> ca998f0ff
TS-2729: Add HTTP/2 support to ATS Fixed clang-analyzer bugs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ca998f0f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ca998f0f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ca998f0f Branch: refs/heads/master Commit: ca998f0ff504bcde2645561dfbd7bbdf23af5e36 Parents: a12b6d2 Author: Bryan Call <[email protected]> Authored: Mon Feb 23 15:23:38 2015 -0800 Committer: Bryan Call <[email protected]> Committed: Mon Feb 23 15:23:38 2015 -0800 ---------------------------------------------------------------------- proxy/http2/HTTP2.h | 2 ++ proxy/http2/Http2ConnectionState.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ca998f0f/proxy/http2/HTTP2.h ---------------------------------------------------------------------- diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h index c644acd..555186d 100644 --- a/proxy/http2/HTTP2.h +++ b/proxy/http2/HTTP2.h @@ -235,6 +235,8 @@ struct Http2HeadersParameter // 6.8 GOAWAY Format struct Http2Goaway { + Http2Goaway(): last_streamid(0), error_code(0) {} + Http2StreamId last_streamid; uint32_t error_code; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ca998f0f/proxy/http2/Http2ConnectionState.cc ---------------------------------------------------------------------- diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc index 79a88dc..63000a1 100644 --- a/proxy/http2/Http2ConnectionState.cc +++ b/proxy/http2/Http2ConnectionState.cc @@ -300,7 +300,6 @@ rcv_rst_stream_frame(Http2ClientSession& cs, Http2ConnectionState& cstate, const return HTTP2_ERROR_PROTOCOL_ERROR; } - cstate.delete_stream(stream); end = frame.reader()->memcpy(buf, sizeof(buf), 0); if (!http2_parse_rst_stream(make_iovec(buf, end - buf), rst_stream)) { @@ -309,6 +308,7 @@ rcv_rst_stream_frame(Http2ClientSession& cs, Http2ConnectionState& cstate, const DebugSsn(&cs, "http2_cs", "[%" PRId64 "] RST_STREAM: Stream ID: %u, Error Code: %u)", cs.connection_id(), stream->get_id(), rst_stream.error_code); + cstate.delete_stream(stream); return HTTP2_ERROR_NO_ERROR; }
