From 1fd5fdd54a98d335bc70b3f4cab0de4ccc3b9b27 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 16 Feb 2014 16:05:26 +0900 Subject: [PATCH] src: Remove redundant SETTINGS_ENABLE_PUSH from server side --- src/HttpServer.cc | 4 +--- src/shrpx_http2_upstream.cc | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/HttpServer.cc b/src/HttpServer.cc index 209933f5..671e0bac 100644 --- a/src/HttpServer.cc +++ b/src/HttpServer.cc @@ -368,11 +368,9 @@ int Http2Handler::on_connect() return r; } nghttp2_settings_entry entry[4]; - size_t niv = 2; + size_t niv = 1; entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS; entry[0].value = 100; - entry[1].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH; - entry[1].value = 0; if(sessions_->get_config()->header_table_size >= 0) { entry[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE; entry[niv].value = sessions_->get_config()->header_table_size; diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc index 085d5f5d..aa59ca44 100644 --- a/src/shrpx_http2_upstream.cc +++ b/src/shrpx_http2_upstream.cc @@ -537,16 +537,13 @@ Http2Upstream::Http2Upstream(ClientHandler *handler) flow_control_ = true; // TODO Maybe call from outside? - nghttp2_settings_entry entry[3]; + nghttp2_settings_entry entry[2]; entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS; entry[0].value = get_config()->http2_max_concurrent_streams; entry[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE; entry[1].value = (1 << get_config()->http2_upstream_window_bits) - 1; - entry[2].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH; - entry[2].value = 0; - rv = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry, sizeof(entry)/sizeof(nghttp2_settings_entry));