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

nghttpx: Don't restart SETTINGS timer, and fix log message in HTTP/2 frontend

This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-21 10:29:11 +09:00
parent e26d6a2b27
commit 2a3b6c11eb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shrpx_http2_upstream.cc
View File

@ -146,6 +146,9 @@ int Http2Upstream::upgrade_upstream(HttpsUpstream *http) {
} }
void Http2Upstream::start_settings_timer() { void Http2Upstream::start_settings_timer() {
if (ev_is_active(&settings_timer_)) {
return;
}
ev_timer_start(handler_->get_loop(), &settings_timer_); ev_timer_start(handler_->get_loop(), &settings_timer_);
} }
@ -930,7 +933,7 @@ int Http2Upstream::on_read() {
rv = nghttp2_session_mem_recv(session_, rb->pos, rb->rleft()); rv = nghttp2_session_mem_recv(session_, rb->pos, rb->rleft());
if (rv < 0) { if (rv < 0) {
if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) { if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
ULOG(ERROR, this) << "nghttp2_session_recv() returned error: " ULOG(ERROR, this) << "nghttp2_session_mem_recv() returned error: "
<< nghttp2_strerror(rv); << nghttp2_strerror(rv);
} }
return -1; return -1;