summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES10
-rw-r--r--modules/http2/h2_mplx.c9
-rw-r--r--modules/http2/h2_proxy_session.c10
-rw-r--r--modules/http2/h2_version.h4
-rw-r--r--modules/http2/mod_proxy_http2.c78
5 files changed, 79 insertions, 32 deletions
diff --git a/CHANGES b/CHANGES
index 1504ba35f8..4dd26ea533 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.1
+ *) mod_http2/mod_proxy_http2: proxy_http2 checks correct master connection aborted status
+ to trigger immediate shutdown of backend connections. This is now always signalled
+ by mod_http2 when the the session is being released.
+ proxy_http2 now only sends a PING frame to the backend when there is not already one
+ in flight. [Stefan Eissing]
+
+ *) mod_proxy_http2: fixed an issue where a proxy_http2 handler entered an infinite
+ loop when encountering certain errors on the backend connection.
+ See <https://bz.apache.org/bugzilla/show_bug.cgi?id=63170>. [Stefan Eissing]
+
*) http: Fix possible empty response with mod_ratelimit for HEAD requests.
PR 63192. [Yann Ylavic]
diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c
index 932c04e9b4..aad7beaa97 100644
--- a/modules/http2/h2_mplx.c
+++ b/modules/http2/h2_mplx.c
@@ -429,7 +429,7 @@ static int stream_cancel_iter(void *ctx, void *val) {
void h2_mplx_release_and_join(h2_mplx *m, apr_thread_cond_t *wait)
{
apr_status_t status;
- int i, wait_secs = 60;
+ int i, wait_secs = 60, old_aborted;
ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c,
"h2_mplx(%ld): start release", m->id);
@@ -440,6 +440,12 @@ void h2_mplx_release_and_join(h2_mplx *m, apr_thread_cond_t *wait)
H2_MPLX_ENTER_ALWAYS(m);
+ /* While really terminating any slave connections, treat the master
+ * connection as aborted. It's not as if we could send any more data
+ * at this point. */
+ old_aborted = m->c->aborted;
+ m->c->aborted = 1;
+
/* How to shut down a h2 connection:
* 1. cancel all streams still active */
while (!h2_ihash_iter(m->streams, stream_cancel_iter, m)) {
@@ -484,6 +490,7 @@ void h2_mplx_release_and_join(h2_mplx *m, apr_thread_cond_t *wait)
h2_ihash_iter(m->shold, unexpected_stream_iter, m);
}
+ m->c->aborted = old_aborted;
H2_MPLX_LEAVE(m);
ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c,
diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c
index e6e0efeddf..b024c8c256 100644
--- a/modules/http2/h2_proxy_session.c
+++ b/modules/http2/h2_proxy_session.c
@@ -653,10 +653,12 @@ h2_proxy_session *h2_proxy_session_setup(const char *id, proxy_conn_rec *p_conn,
}
else {
h2_proxy_session *session = p_conn->data;
- apr_interval_time_t age = apr_time_now() - session->last_frame_received;
- if (age > apr_time_from_sec(1)) {
- session->check_ping = 1;
- nghttp2_submit_ping(session->ngh2, 0, (const uint8_t *)"nevergonnagiveyouup");
+ if (!session->check_ping) {
+ apr_interval_time_t age = apr_time_now() - session->last_frame_received;
+ if (age > apr_time_from_sec(1)) {
+ session->check_ping = 1;
+ nghttp2_submit_ping(session->ngh2, 0, (const uint8_t *)"nevergonnagiveyouup");
+ }
}
}
return p_conn->data;
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 70770431de..5260c2258c 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 "1.12.3-DEV"
+#define MOD_HTTP2_VERSION "1.12.6-DEV"
/**
* @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 0x010c03
+#define MOD_HTTP2_VERSION_NUM 0x010c06
#endif /* mod_h2_h2_version_h */
diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c
index a585706aaf..15418ded58 100644
--- a/modules/http2/mod_proxy_http2.c
+++ b/modules/http2/mod_proxy_http2.c
@@ -57,6 +57,7 @@ static void (*req_engine_done)(h2_req_engine *engine, conn_rec *r_conn,
apr_status_t status);
typedef struct h2_proxy_ctx {
+ conn_rec *master;
conn_rec *owner;
apr_pool_t *pool;
request_rec *rbase;
@@ -77,6 +78,7 @@ typedef struct h2_proxy_ctx {
unsigned standalone : 1;
unsigned is_ssl : 1;
+ unsigned flushall : 1;
apr_status_t r_status; /* status of our first request work */
h2_proxy_session *session; /* current http2 session against backend */
@@ -361,58 +363,67 @@ static apr_status_t proxy_engine_run(h2_proxy_ctx *ctx) {
"eng(%s): run session %s", ctx->engine_id, ctx->session->id);
ctx->session->user_data = ctx;
- while (!ctx->owner->aborted) {
+ while (1) {
+ if (ctx->master->aborted) {
+ status = APR_ECONNABORTED;
+ goto out;
+ }
+
if (APR_SUCCESS == h2_proxy_fifo_try_pull(ctx->requests, (void**)&r)) {
add_request(ctx->session, r);
}
-
status = h2_proxy_session_process(ctx->session);
if (status == APR_SUCCESS) {
- apr_status_t s2;
- /* ongoing processing, call again */
+ /* ongoing processing, check if we have room to handle more streams,
+ * maybe the remote side changed their limit */
if (ctx->session->remote_max_concurrent > 0
&& ctx->session->remote_max_concurrent != ctx->capacity) {
ctx->capacity = H2MIN((int)ctx->session->remote_max_concurrent,
h2_proxy_fifo_capacity(ctx->requests));
}
- s2 = next_request(ctx, 0);
- if (s2 == APR_ECONNABORTED) {
- /* master connection gone */
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, s2, ctx->owner,
- APLOGNO(03374) "eng(%s): pull request",
- ctx->engine_id);
- /* give notice that we're leaving and cancel all ongoing
- * streams. */
- next_request(ctx, 1);
- h2_proxy_session_cancel_all(ctx->session);
- h2_proxy_session_process(ctx->session);
- status = ctx->r_status = APR_SUCCESS;
- break;
+ /* try to pull more request, if our capacity allows it */
+ if (APR_ECONNABORTED == next_request(ctx, 0)) {
+ status = APR_ECONNABORTED;
+ goto out;
}
+ /* If we have no ongoing streams and nothing in our queue, we
+ * terminate processing and return to our caller. */
if ((h2_proxy_fifo_count(ctx->requests) == 0)
&& h2_proxy_ihash_empty(ctx->session->streams)) {
- break;
+ goto out;
}
}
else {
- /* end of processing, maybe error */
+ /* Encountered an error during session processing */
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, ctx->owner,
APLOGNO(03375) "eng(%s): end of session %s",
ctx->engine_id, ctx->session->id);
- /*
- * Any open stream of that session needs to
+ /* Any open stream of that session needs to
* a) be reopened on the new session iff safe to do so
* b) reported as done (failed) otherwise
*/
h2_proxy_session_cleanup(ctx->session, session_req_done);
- break;
+ goto out;
+ }
+ }
+
+out:
+ if (APR_ECONNABORTED == status) {
+ /* master connection gone */
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, ctx->owner,
+ APLOGNO(03374) "eng(%s): master connection gone", ctx->engine_id);
+ /* give notice that we're leaving and cancel all ongoing streams. */
+ next_request(ctx, 1);
+ h2_proxy_session_cancel_all(ctx->session);
+ h2_proxy_session_process(ctx->session);
+ if (!ctx->master->aborted) {
+ status = ctx->r_status = APR_SUCCESS;
}
}
ctx->session->user_data = NULL;
ctx->session = NULL;
-
return status;
}
@@ -500,6 +511,7 @@ static int proxy_http2_handler(request_rec *r,
}
ctx = apr_pcalloc(r->pool, sizeof(*ctx));
+ ctx->master = r->connection->master? r->connection->master : r->connection;
ctx->owner = r->connection;
ctx->pool = r->pool;
ctx->rbase = r;
@@ -508,6 +520,7 @@ static int proxy_http2_handler(request_rec *r,
ctx->is_ssl = is_ssl;
ctx->worker = worker;
ctx->conf = conf;
+ ctx->flushall = apr_table_get(r->subprocess_env, "proxy-flushall")? 1 : 0;
ctx->r_status = HTTP_SERVICE_UNAVAILABLE;
h2_proxy_fifo_set_create(&ctx->requests, ctx->pool, 100);
@@ -520,6 +533,11 @@ static int proxy_http2_handler(request_rec *r,
"H2: serving URL %s", url);
run_connect:
+ if (ctx->master->aborted) {
+ ctx->r_status = APR_ECONNABORTED;
+ goto cleanup;
+ }
+
/* Get a proxy_conn_rec from the worker, might be a new one, might
* be one still open from another request, or it might fail if the
* worker is stopped or in error. */
@@ -593,6 +611,11 @@ run_connect:
}
run_session:
+ if (ctx->owner->aborted) {
+ ctx->r_status = APR_ECONNABORTED;
+ goto cleanup;
+ }
+
status = proxy_engine_run(ctx);
if (status == APR_SUCCESS) {
/* session and connection still ok */
@@ -607,6 +630,11 @@ run_session:
}
reconnect:
+ if (ctx->master->aborted) {
+ ctx->r_status = APR_ECONNABORTED;
+ goto cleanup;
+ }
+
if (next_request(ctx, 1) == APR_SUCCESS) {
/* Still more to do, tear down old conn and start over */
if (ctx->p_conn) {
@@ -618,7 +646,7 @@ reconnect:
ctx->p_conn = NULL;
}
++reconnects;
- if (reconnects < 5 && !ctx->owner->aborted) {
+ if (reconnects < 5 && !ctx->master->aborted) {
goto run_connect;
}
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner, APLOGNO(10023)
@@ -639,7 +667,7 @@ cleanup:
ctx->p_conn = NULL;
}
- /* Any requests will still have need to fail */
+ /* Any requests we still have need to fail */
while (APR_SUCCESS == h2_proxy_fifo_try_pull(ctx->requests, (void**)&r)) {
request_done(ctx, r, HTTP_SERVICE_UNAVAILABLE, 1);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 01:12:06 +0100