diff --git a/changes-entries/h2_v2.0.32.txt b/changes-entries/h2_v2.0.32.txt new file mode 100644 index 0000000000..a1597cda50 --- /dev/null +++ b/changes-entries/h2_v2.0.32.txt @@ -0,0 +1,5 @@ + *) mod_http2: update to version 2.0.32 + The code setting the connection window size was set wrong, + preventing `H2WindowSize` to work. + Fixed . + [Stefan Eissing, Michael Kaufmann] diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index ddfe047388..ffc83ed380 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -1265,7 +1265,7 @@ static apr_status_t mplx_pollset_poll(h2_mplx *m, apr_interval_time_t timeout, if (on_stream_input) { APR_ARRAY_PUSH(m->streams_ev_in, h2_stream*) = m->stream0; } - continue; + break; } } diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index ee380efc2c..fc8b6119ae 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -1154,13 +1154,13 @@ static apr_status_t h2_session_start(h2_session *session, int *rv) * interim updates, any smaller connection window will lead to blocking * in DATA flow. */ - *rv = nghttp2_submit_window_update(session->ngh2, NGHTTP2_FLAG_NONE, - 0, NGHTTP2_MAX_WINDOW_SIZE - win_size); + *rv = nghttp2_session_set_local_window_size( + session->ngh2, NGHTTP2_FLAG_NONE, 0, NGHTTP2_MAX_WINDOW_SIZE); if (*rv != 0) { status = APR_EGENERAL; ap_log_cerror(APLOG_MARK, APLOG_ERR, status, session->c1, H2_SSSN_LOG(APLOGNO(02970), session, - "nghttp2_submit_window_update: %s"), + "nghttp2_session_set_local_window_size: %s"), nghttp2_strerror(*rv)); } } diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h index 7016b6bbd6..13441a0935 100644 --- a/modules/http2/h2_version.h +++ b/modules/http2/h2_version.h @@ -27,7 +27,7 @@ * @macro * Version number of the http2 module as c string */ -#define MOD_HTTP2_VERSION "2.0.31-git" +#define MOD_HTTP2_VERSION "2.0.32" /** * @macro @@ -35,7 +35,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_HTTP2_VERSION_NUM 0x02001f +#define MOD_HTTP2_VERSION_NUM 0x020020 #endif /* mod_h2_h2_version_h */