diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 17:06:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 17:06:36 +0000 |
| commit | e5260a81260d593ababfa53fcd8b82c42f30fa8b (patch) | |
| tree | 4397979cf8d951f4f6dc5f3360c67677ac65a9fc /modules/http2 | |
| parent | Releasing progress-linux version 2.4.59-2~progress7.99u1. (diff) | |
| download | apache2-e5260a81260d593ababfa53fcd8b82c42f30fa8b.tar.xz apache2-e5260a81260d593ababfa53fcd8b82c42f30fa8b.zip | |
Merging upstream version 2.4.60.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules/http2')
| -rw-r--r-- | modules/http2/h2_c2.c | 7 | ||||
| -rw-r--r-- | modules/http2/mod_proxy_http2.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/modules/http2/h2_c2.c b/modules/http2/h2_c2.c index a955200..c65a521 100644 --- a/modules/http2/h2_c2.c +++ b/modules/http2/h2_c2.c @@ -370,6 +370,13 @@ static apr_status_t h2_c2_filter_out(ap_filter_t* f, apr_bucket_brigade* bb) h2_conn_ctx_t *conn_ctx = h2_conn_ctx_get(f->c); apr_status_t rv; + if (bb == NULL) { +#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 1) + f->c->data_in_output_filters = 0; +#endif + return APR_SUCCESS; + } + ap_assert(conn_ctx); #if AP_HAS_RESPONSE_BUCKETS if (!conn_ctx->has_final_response) { diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index ebf8f61..e5cb0ba 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -317,7 +317,7 @@ static int proxy_http2_handler(request_rec *r, apr_port_t proxyport) { const char *proxy_func; - char *locurl = url, *u; + char *locurl, *u; apr_size_t slen; int is_ssl = 0; apr_status_t status; @@ -382,6 +382,7 @@ run_connect: goto cleanup; } + locurl = url; ctx->p_conn->is_ssl = ctx->is_ssl; /* Step One: Determine the URL to connect to (might be a proxy), |