Author: icing
Date: Fri May 29 09:09:41 2026
New Revision: 1934743
Log:
*) mod_http2: update to version 2.0.42
Fix excessive file description use for non-TLS frontend connections when
sending files. Fixes <https://github.com/icing/mod_h2/issues/325>
Added:
httpd/httpd/trunk/changes-entries/h2_v2.0.42.txt
Modified:
httpd/httpd/trunk/modules/http2/h2_c1_io.c
httpd/httpd/trunk/modules/http2/h2_c1_io.h
httpd/httpd/trunk/modules/http2/h2_config.c
httpd/httpd/trunk/modules/http2/h2_version.h
Added: httpd/httpd/trunk/changes-entries/h2_v2.0.42.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ httpd/httpd/trunk/changes-entries/h2_v2.0.42.txt Fri May 29 09:09:41 2026 (r1934743)
@@ -0,0 +1,4 @@
+ *) mod_http2: update to version 2.0.42
+ Fix excessive file description use for non-TLS frontend connections when
+ sending files. Fixes <https://github.com/icing/mod_h2/issues/325>
+ [Stefan Eissing]
Modified: httpd/httpd/trunk/modules/http2/h2_c1_io.c
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_c1_io.c Fri May 29 08:43:54 2026 (r1934742)
+++ httpd/httpd/trunk/modules/http2/h2_c1_io.c Fri May 29 09:09:41 2026 (r1934743)
@@ -144,32 +144,21 @@ apr_status_t h2_c1_io_init(h2_c1_io *io,
io->session = session;
io->output = apr_brigade_create(c->pool, c->bucket_alloc);
- io->is_tls = ap_ssl_conn_is_ssl(session->c1);
- io->buffer_output = io->is_tls;
io->flush_threshold = 4 * (apr_size_t)h2_config_sgeti64(session->s, H2_CONF_STREAM_MAX_MEM);
- if (io->buffer_output) {
- /* This is what we start with,
- * see https://issues.apache.org/jira/browse/TS-2503
- */
- io->warmup_size = h2_config_sgeti64(session->s, H2_CONF_TLS_WARMUP_SIZE);
- io->cooldown_usecs = (h2_config_sgeti(session->s, H2_CONF_TLS_COOLDOWN_SECS)
- * APR_USEC_PER_SEC);
- io->cooldown_usecs = 0;
- io->write_size = (io->cooldown_usecs > 0?
- WRITE_SIZE_INITIAL : WRITE_SIZE_MAX);
- }
- else {
- io->warmup_size = 0;
- io->cooldown_usecs = 0;
- io->write_size = 0;
- }
+ /* This is what we start with,
+ * see https://issues.apache.org/jira/browse/TS-2503
+ */
+ io->warmup_size = h2_config_sgeti64(session->s, H2_CONF_TLS_WARMUP_SIZE);
+ io->cooldown_usecs = (h2_config_sgeti(session->s, H2_CONF_TLS_COOLDOWN_SECS)
+ * APR_USEC_PER_SEC);
+ io->write_size = (io->cooldown_usecs > 0?
+ WRITE_SIZE_INITIAL : WRITE_SIZE_MAX);
if (APLOGctrace1(c)) {
ap_log_cerror(APLOG_MARK, APLOG_TRACE4, 0, c,
- "h2_c1_io(%ld): init, buffering=%d, warmup_size=%ld, "
- "cd_secs=%f", c->id, io->buffer_output,
- (long)io->warmup_size,
+ "h2_c1_io(%ld): init, warmup_size=%ld, "
+ "cd_secs=%f", c->id, (long)io->warmup_size,
((double)io->cooldown_usecs/APR_USEC_PER_SEC));
}
@@ -366,25 +355,19 @@ apr_status_t h2_c1_io_add_data(h2_c1_io
ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, io->session->c1,
"h2_c1_io(%ld): adding %ld data bytes",
io->session->c1->id, (long)length);
- if (io->buffer_output) {
- while (length > 0) {
- remain = assure_scratch_space(io);
- if (remain >= length) {
- memcpy(io->scratch + io->slen, data, length);
- io->slen += length;
- length = 0;
- }
- else {
- memcpy(io->scratch + io->slen, data, remain);
- io->slen += remain;
- data += remain;
- length -= remain;
- }
+ while (length > 0) {
+ remain = assure_scratch_space(io);
+ if (remain >= length) {
+ memcpy(io->scratch + io->slen, data, length);
+ io->slen += length;
+ length = 0;
+ }
+ else {
+ memcpy(io->scratch + io->slen, data, remain);
+ io->slen += remain;
+ data += remain;
+ length -= remain;
}
- }
- else {
- status = apr_brigade_write(io->output, NULL, NULL, data, length);
- io->buffered_len += length;
}
return status;
}
@@ -403,7 +386,7 @@ apr_status_t h2_c1_io_append(h2_c1_io *i
APR_BUCKET_REMOVE(b);
APR_BRIGADE_INSERT_TAIL(io->output, b);
}
- else if (io->buffer_output) {
+ else {
apr_size_t remain = assure_scratch_space(io);
if (b->length > remain) {
apr_bucket_split(b, remain);
@@ -423,13 +406,6 @@ apr_status_t h2_c1_io_append(h2_c1_io *i
continue;
}
}
- else {
- /* no buffering, forward buckets setaside on flush */
- apr_bucket_setaside(b, io->session->c1->pool);
- APR_BUCKET_REMOVE(b);
- APR_BRIGADE_INSERT_TAIL(io->output, b);
- io->buffered_len += b->length;
- }
}
cleanup:
return rv;
Modified: httpd/httpd/trunk/modules/http2/h2_c1_io.h
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_c1_io.h Fri May 29 08:43:54 2026 (r1934742)
+++ httpd/httpd/trunk/modules/http2/h2_c1_io.h Fri May 29 09:09:41 2026 (r1934743)
@@ -30,7 +30,6 @@ typedef struct {
struct h2_session *session;
apr_bucket_brigade *output;
- int is_tls;
int unflushed;
apr_time_t cooldown_usecs;
apr_int64_t warmup_size;
@@ -40,7 +39,6 @@ typedef struct {
apr_int64_t bytes_read;
apr_int64_t bytes_written;
- int buffer_output;
apr_off_t buffered_len;
apr_off_t flush_threshold;
unsigned int is_flushed : 1;
Modified: httpd/httpd/trunk/modules/http2/h2_config.c
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_config.c Fri May 29 08:43:54 2026 (r1934742)
+++ httpd/httpd/trunk/modules/http2/h2_config.c Fri May 29 09:09:41 2026 (r1934743)
@@ -106,7 +106,7 @@ static h2_config defconf = {
1, /* modern TLS only */
-1, /* HTTP/1 Upgrade support */
1024*1024, /* TLS warmup size */
- 1, /* TLS cooldown secs */
+ 0, /* TLS cooldown secs */
1, /* HTTP/2 server push enabled */
NULL, /* map of content-type to priorities */
256, /* push diary size */
Modified: httpd/httpd/trunk/modules/http2/h2_version.h
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h Fri May 29 08:43:54 2026 (r1934742)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Fri May 29 09:09:41 2026 (r1934743)
@@ -27,7 +27,7 @@
* @macro
* Version number of the http2 module as c string
*/
-#define MOD_HTTP2_VERSION "2.0.41"
+#define MOD_HTTP2_VERSION "2.0.42"
/**
* @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 0x020029
+#define MOD_HTTP2_VERSION_NUM 0x02002a
#endif /* mod_h2_h2_version_h */
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.