You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/04/16 23:55:45 UTC

[1/2] trafficserver git commit: TS-3519: HTTP/2 seeing a lot of GOAWAY frames being sent

Repository: trafficserver
Updated Branches:
  refs/heads/master adec46e9d -> 3afac5a26


TS-3519: HTTP/2 seeing a lot of GOAWAY frames being sent


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b5730b1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b5730b1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b5730b1

Branch: refs/heads/master
Commit: 7b5730b11e8ef9993137df08c7e8411877d74cfa
Parents: adec46e
Author: Bryan Call <bc...@apache.org>
Authored: Thu Apr 16 16:53:15 2015 -0500
Committer: Bryan Call <bc...@apache.org>
Committed: Thu Apr 16 16:53:15 2015 -0500

----------------------------------------------------------------------
 proxy/http2/Http2ConnectionState.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b5730b1/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 1e50b57..2af2d6a 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -284,7 +284,7 @@ rcv_rst_stream_frame(Http2ClientSession &cs, Http2ConnectionState &cstate, const
   DebugSsn(&cs, "http2_cs", "[%" PRId64 "] Received RST_STREAM frame.", cs.connection_id());
 
   Http2Stream *stream = cstate.find_stream(frame.header().streamid);
-  if (stream == NULL) {
+  if (frame.header().streamid == 0) {
     return HTTP2_ERROR_PROTOCOL_ERROR;
   }
 
@@ -292,7 +292,7 @@ rcv_rst_stream_frame(Http2ClientSession &cs, Http2ConnectionState &cstate, const
     return HTTP2_ERROR_FRAME_SIZE_ERROR;
   }
 
-  if (!stream->change_state(frame.header().type, frame.header().flags)) {
+  if (stream != NULL && !stream->change_state(frame.header().type, frame.header().flags)) {
     // If a RST_STREAM frame identifying an idle stream is received, the
     // recipient MUST treat this as a connection error of type PROTOCOL_ERROR.
     return HTTP2_ERROR_PROTOCOL_ERROR;
@@ -306,7 +306,9 @@ 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);
+  if (stream != NULL) {
+    cstate.delete_stream(stream);
+  }
 
   return HTTP2_ERROR_NO_ERROR;
 }


[2/2] trafficserver git commit: TS-3519: Updated CHANGES

Posted by bc...@apache.org.
TS-3519: Updated CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3afac5a2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3afac5a2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3afac5a2

Branch: refs/heads/master
Commit: 3afac5a26a5b4cbb140a8d49f37035693b28a202
Parents: 7b5730b
Author: Bryan Call <bc...@apache.org>
Authored: Thu Apr 16 16:55:06 2015 -0500
Committer: Bryan Call <bc...@apache.org>
Committed: Thu Apr 16 16:55:06 2015 -0500

----------------------------------------------------------------------
 CHANGES | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3afac5a2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9ded224..044cae6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
-  *) [TS-3520]: Fix logging core dump due to invalid unmapped url length/buffer
+  *) [TS-3519] HTTP/2 seeing a lot of GOAWAY frames being sent
+
+  *) [TS-3520] Fix logging core dump due to invalid unmapped url length/buffer
 
   *) [TS-3489] Not able to set more than 1 accept thread per port and cleaned
    other thread configurable ranges