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

nghttpx: Fix HTTP/2 settings timer for HTTP/2 backend

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-05 00:27:38 +09:00
parent 3ae44ef2f3
commit 8fb544523c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shrpx_http2_session.cc
View File

@ -61,6 +61,7 @@ void connchk_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
namespace { namespace {
void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
auto http2session = static_cast<Http2Session *>(w->data); auto http2session = static_cast<Http2Session *>(w->data);
http2session->stop_settings_timer();
SSLOG(INFO, http2session) << "SETTINGS timeout"; SSLOG(INFO, http2session) << "SETTINGS timeout";
if (http2session->terminate_session(NGHTTP2_SETTINGS_TIMEOUT) != 0) { if (http2session->terminate_session(NGHTTP2_SETTINGS_TIMEOUT) != 0) {
http2session->disconnect(); http2session->disconnect();
@ -669,7 +670,7 @@ int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
} // namespace } // namespace
void Http2Session::start_settings_timer() { void Http2Session::start_settings_timer() {
ev_timer_start(loop_, &settings_timer_); ev_timer_again(loop_, &settings_timer_);
} }
void Http2Session::stop_settings_timer() { void Http2Session::stop_settings_timer() {