trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From masa...@apache.org
Subject trafficserver git commit: TS-4298: Breakdown parameter checks in Http2::init()
Date Mon, 28 Mar 2016 05:44:25 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 2a0a2e96f -> bd645d36d


TS-4298: Breakdown parameter checks in Http2::init()

This closes #539


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

Branch: refs/heads/master
Commit: bd645d36d0544a294b34189f6b5f9b53e37bdcdd
Parents: 2a0a2e9
Author: Masaori Koshiba <masaori@apache.org>
Authored: Fri Mar 25 15:48:26 2016 +0900
Committer: Masaori Koshiba <masaori@apache.org>
Committed: Mon Mar 28 14:43:06 2016 +0900

----------------------------------------------------------------------
 proxy/http2/HTTP2.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bd645d36/proxy/http2/HTTP2.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index c9ea2bc..3eac878 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -756,12 +756,12 @@ Http2::init()
   REC_EstablishStaticConfigInt32U(active_timeout_in, "proxy.config.http2.active_timeout_in");
 
   // If any settings is broken, ATS should not start
-  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
max_concurrent_streams_in}) &&
-                     http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
min_concurrent_streams_in}) &&
-                     http2_settings_parameter_is_valid({HTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
initial_window_size}) &&
-                     http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_FRAME_SIZE, max_frame_size})
&&
-                     http2_settings_parameter_is_valid({HTTP2_SETTINGS_HEADER_TABLE_SIZE,
header_table_size}) &&
-                     http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE,
max_header_list_size}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
max_concurrent_streams_in}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
min_concurrent_streams_in}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
initial_window_size}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_FRAME_SIZE, max_frame_size}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_HEADER_TABLE_SIZE,
header_table_size}));
+  ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE,
max_header_list_size}));
 
   // Setup statistics
   http2_rsb = RecAllocateRawStatBlock(static_cast<int>(HTTP2_N_STATS));


Mime
View raw message