trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [1/4] trafficserver git commit: TS-3721: Remove scoping on enum for HTTP2_FRAME_TYPE_MAX
Date Fri, 26 Jun 2015 18:01:51 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/6.0.x e2f90e377 -> 703ccb710


TS-3721: Remove scoping on enum for HTTP2_FRAME_TYPE_MAX

(cherry picked from commit 4377dabd0f6c8ec9275ec456d295907a06a1b591)


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

Branch: refs/heads/6.0.x
Commit: 8768f6f88c3eef4cae9b5656916dc8f54853d94a
Parents: e2f90e3
Author: Bryan Call <bcall@apache.org>
Authored: Thu Jun 25 16:27:23 2015 -0700
Committer: Bryan Call <bcall@apache.org>
Committed: Fri Jun 26 10:22:33 2015 -0700

----------------------------------------------------------------------
 proxy/http2/Http2ConnectionState.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8768f6f8/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 6c26188..96eaa3a 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -640,8 +640,8 @@ Http2ConnectionState::main_event_handler(int event, void *edata)
     Http2ErrorCode error;
 
     //  Implementations MUST ignore and discard any frame that has a type that is unknown.
-    ink_assert(frame->header().type < Http2FrameType::HTTP2_FRAME_TYPE_MAX);
-    if (frame->header().type >= Http2FrameType::HTTP2_FRAME_TYPE_MAX) {
+    ink_assert(frame->header().type < HTTP2_FRAME_TYPE_MAX);
+    if (frame->header().type >= HTTP2_FRAME_TYPE_MAX) {
       return 0;
     }
 


Mime
View raw message