Skip to content

Commit c764e0c

Browse files
committed
*) mod_http2: update to version 2.0.38
Source sync with mod_h2 github repository. No functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1931709 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3e100a9 commit c764e0c

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

changes-entries/h2_v2.0.38.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*) mod_http2: update to version 2.0.38
2+
Source sync with mod_h2 github repository. No functional change.
3+
[Stefan Eissing]

modules/http2/h2_c1.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747

4848
static struct h2_workers *workers;
4949

50-
static int async_mpm, mpm_can_waitio;
50+
static int async_mpm;
51+
#ifdef AP_MPMQ_CAN_WAITIO
52+
static int mpm_can_waitio;
53+
#endif
5154

5255
APR_OPTIONAL_FN_TYPE(ap_logio_add_bytes_in) *h2_c_logio_add_bytes_in;
5356
APR_OPTIONAL_FN_TYPE(ap_logio_add_bytes_out) *h2_c_logio_add_bytes_out;

modules/http2/h2_session.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
125125
apr_allocator_t *allocator;
126126
apr_pool_t *stream_pool;
127127
apr_status_t rv;
128-
128+
129129
rv = apr_allocator_create(&allocator);
130130
if (rv != APR_SUCCESS)
131131
return NULL;
@@ -135,7 +135,7 @@ static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
135135
apr_allocator_owner_set(allocator, stream_pool);
136136
apr_pool_abort_set(abort_on_oom, stream_pool);
137137
apr_pool_tag(stream_pool, "h2_stream");
138-
138+
139139
stream = h2_stream_create(stream_id, stream_pool, session,
140140
session->monitor, initiated_on);
141141
if (stream) {

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.37"
30+
#define MOD_HTTP2_VERSION "2.0.38"
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 0x020025
38+
#define MOD_HTTP2_VERSION_NUM 0x020026
3939

4040

4141
#endif /* mod_h2_h2_version_h */

0 commit comments

Comments
 (0)