From b44b9b6b2a4af4cd89b80190df85f67d57ecd43b Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 24 Sep 2021 11:25:42 +0000 Subject: mod_proxy: Handle ap_proxy_buckets_lifetime_transform() errors. * modules/proxy/mod_proxy.h,modules/proxy/proxy_util.c: Add ap_proxy_fill_error_brigade() to factorize proxy error handling on the client connection side. * modules/proxy/mod_proxy_{http,ajp,uwsgi}.c: Use ap_proxy_fill_error_brigade() where needed, including when an empty brigade is returned on the backend side or when calling ap_proxy_buckets_lifetime_transform fails. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1893595 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_mmn.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 7cc2bcb812..01aa08b0e3 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -691,6 +691,7 @@ * (this MAJOR bump). Overall there is no MAJOR bumb * for 20210506.0 + 20210924.0, MINOR bump only for * adding ap_proxy_tunnel_conn_bytes_{in,out}(). + * 20210924.1 (2.5.1-dev) Add ap_proxy_fill_error_brigade() */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -698,7 +699,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20210924 #endif -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a -- cgit v1.2.1