Skip to content

Commit b84e2e2

Browse files
committed
*) mod_http2: update to version 2.0.32
The code setting the connection window size was set wrong, preventing `H2WindowSize` to work. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925975 13f79535-47bb-0310-9956-ffa450edef68
1 parent c15471e commit b84e2e2

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

changes-entries/h2_v2.0.32.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*) mod_http2: update to version 2.0.32
2+
The code setting the connection window size was set wrong,
3+
preventing `H2WindowSize` to work.
4+
Fixed <https://github.com/icing/mod_h2/issues/300>.
5+
[Stefan Eissing, Michael Kaufmann]

modules/http2/h2_mplx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ static apr_status_t mplx_pollset_poll(h2_mplx *m, apr_interval_time_t timeout,
12651265
if (on_stream_input) {
12661266
APR_ARRAY_PUSH(m->streams_ev_in, h2_stream*) = m->stream0;
12671267
}
1268-
continue;
1268+
break;
12691269
}
12701270
}
12711271

modules/http2/h2_session.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,13 +1154,13 @@ static apr_status_t h2_session_start(h2_session *session, int *rv)
11541154
* interim updates, any smaller connection window will lead to blocking
11551155
* in DATA flow.
11561156
*/
1157-
*rv = nghttp2_submit_window_update(session->ngh2, NGHTTP2_FLAG_NONE,
1158-
0, NGHTTP2_MAX_WINDOW_SIZE - win_size);
1157+
*rv = nghttp2_session_set_local_window_size(
1158+
session->ngh2, NGHTTP2_FLAG_NONE, 0, NGHTTP2_MAX_WINDOW_SIZE);
11591159
if (*rv != 0) {
11601160
status = APR_EGENERAL;
11611161
ap_log_cerror(APLOG_MARK, APLOG_ERR, status, session->c1,
11621162
H2_SSSN_LOG(APLOGNO(02970), session,
1163-
"nghttp2_submit_window_update: %s"),
1163+
"nghttp2_session_set_local_window_size: %s"),
11641164
nghttp2_strerror(*rv));
11651165
}
11661166
}

modules/http2/h2_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
* @macro
2828
* Version number of the http2 module as c string
2929
*/
30-
#define MOD_HTTP2_VERSION "2.0.31-git"
30+
#define MOD_HTTP2_VERSION "2.0.32"
3131

3232
/**
3333
* @macro
3434
* Numerical representation of the version number of the http2 module
3535
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3636
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3737
*/
38-
#define MOD_HTTP2_VERSION_NUM 0x02001f
38+
#define MOD_HTTP2_VERSION_NUM 0x020020
3939

4040

4141
#endif /* mod_h2_h2_version_h */

0 commit comments

Comments
 (0)