diff options
| author | Stefan Eissing <icing@apache.org> | 2018-12-19 13:57:05 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2018-12-19 13:57:05 +0100 |
| commit | a28d3fdf6309fce29d76a825420014921af1d56d (patch) | |
| tree | b03577058d384f35531c0eaadb20c82c01360b50 /modules/http2/mod_proxy_http2.c | |
| parent | Update after backport of r1849174 r1849174 (diff) | |
| download | apache2-a28d3fdf6309fce29d76a825420014921af1d56d.tar.xz apache2-a28d3fdf6309fce29d76a825420014921af1d56d.zip | |
mod_http2: mergine trunk+2.4.x code divergences back into a single source with proper MMN checks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/http2/mod_proxy_http2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index 92413090b6..21f8e1d1f9 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -16,6 +16,7 @@ #include <nghttp2/nghttp2.h> +#include <ap_mmn.h> #include <httpd.h> #include <mod_proxy.h> #include "mod_http2.h" @@ -604,7 +605,9 @@ reconnect: /* Still more to do, tear down old conn and start over */ if (ctx->p_conn) { ctx->p_conn->close = 1; +#if AP_MODULE_MAGIC_AT_LEAST(20140207, 2) proxy_run_detach_backend(r, ctx->p_conn); +#endif ap_proxy_release_connection(ctx->proxy_func, ctx->p_conn, ctx->server); ctx->p_conn = NULL; } @@ -623,7 +626,9 @@ cleanup: /* close socket when errors happened or session shut down (EOF) */ ctx->p_conn->close = 1; } +#if AP_MODULE_MAGIC_AT_LEAST(20140207, 2) proxy_run_detach_backend(ctx->rbase, ctx->p_conn); +#endif ap_proxy_release_connection(ctx->proxy_func, ctx->p_conn, ctx->server); ctx->p_conn = NULL; } |