walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Remove flow_control_ from Http2Session 

This is a legacy of SPDY era where it can disable flow control.
This commit is contained in:
Tatsuhiro Tsujikawa 2016-06-04 12:38:39 +09:00
parent ef3fa23b2e
commit 9237d30e34
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shrpx_http2_downstream_connection.cc
View File

@ -479,8 +479,7 @@ int Http2DownstreamConnection::resume_read(IOCtrlReason reason,
size_t consumed) { size_t consumed) {
int rv; int rv;
if (http2session_->get_state() != Http2Session::CONNECTED || if (http2session_->get_state() != Http2Session::CONNECTED) {
!http2session_->get_flow_control()) {
return 0; return 0;
} }

7
src/shrpx_http2_session.cc
View File

@ -197,8 +197,7 @@ Http2Session::Http2Session(struct ev_loop *loop, SSL_CTX *ssl_ctx,
session_(nullptr), session_(nullptr),
state_(DISCONNECTED), state_(DISCONNECTED),
connection_check_state_(CONNECTION_CHECK_NONE), connection_check_state_(CONNECTION_CHECK_NONE),
freelist_zone_(FREELIST_ZONE_NONE), freelist_zone_(FREELIST_ZONE_NONE) {
flow_control_(false) {
read_ = write_ = &Http2Session::noop; read_ = write_ = &Http2Session::noop;
on_read_ = &Http2Session::read_noop; on_read_ = &Http2Session::read_noop;
@ -675,8 +674,6 @@ int Http2Session::submit_rst_stream(int32_t stream_id, uint32_t error_code) {
nghttp2_session *Http2Session::get_session() const { return session_; } nghttp2_session *Http2Session::get_session() const { return session_; }
bool Http2Session::get_flow_control() const { return flow_control_; }
int Http2Session::resume_data(Http2DownstreamConnection *dconn) { int Http2Session::resume_data(Http2DownstreamConnection *dconn) {
assert(state_ == CONNECTED); assert(state_ == CONNECTED);
auto downstream = dconn->get_downstream(); auto downstream = dconn->get_downstream();
@ -1525,8 +1522,6 @@ int Http2Session::connection_made() {
return -1; return -1;
} }
flow_control_ = true;
std::array<nghttp2_settings_entry, 3> entry; std::array<nghttp2_settings_entry, 3> entry;
size_t nentry = 2; size_t nentry = 2;
entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS; entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;

3
src/shrpx_http2_session.h
View File

@ -96,8 +96,6 @@ public:
nghttp2_session *get_session() const; nghttp2_session *get_session() const;
bool get_flow_control() const;
int resume_data(Http2DownstreamConnection *dconn); int resume_data(Http2DownstreamConnection *dconn);
int connection_made(); int connection_made();
@ -264,7 +262,6 @@ private:
int state_; int state_;
int connection_check_state_; int connection_check_state_;
int freelist_zone_; int freelist_zone_;
bool flow_control_;
}; };
nghttp2_session_callbacks *create_http2_downstream_callbacks(); nghttp2_session_callbacks *create_http2_downstream_callbacks();