From: Willy Tarreau <w@1wt.eu>
Date: Fri, 12 Feb 2021 07:40:29 +0000 (+0100)
Subject: BUG/MINOR: http-htx: defpx must be a const in proxy_dup_default_conf_errors()
X-Git-Tag: v2.4-dev8~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=016255a483f28190ae5ba5652d6db7e16b5d222d;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http-htx: defpx must be a const in proxy_dup_default_conf_errors()

This is just an API bug but it's annoying when trying to tidy the code.
The default proxy passed in argument must be a const and not a variable.
No backport is needed as it only impacts new code.
---

diff --git a/include/haproxy/http_htx.h b/include/haproxy/http_htx.h
index 70df6806f0..fbd4438de2 100644
--- a/include/haproxy/http_htx.h
+++ b/include/haproxy/http_htx.h
@@ -70,7 +70,7 @@ struct buffer *http_load_errorfile(const char *file, char **errmsg);
 struct buffer *http_load_errormsg(const char *key, const struct ist msg, char **errmsg);
 struct buffer *http_parse_errorfile(int status, const char *file, char **errmsg);
 struct buffer *http_parse_errorloc(int errloc, int status, const char *url, char **errmsg);
-int proxy_dup_default_conf_errors(struct proxy *curpx, struct proxy *defpx, char **errmsg);
+int proxy_dup_default_conf_errors(struct proxy *curpx, const struct proxy *defpx, char **errmsg);
 void proxy_release_conf_errors(struct proxy *px);
 
 #endif /* _HAPROXY_HTTP_HTX_H */
diff --git a/src/http_htx.c b/src/http_htx.c
index bb3d8d0f09..e2e6ce1ef3 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -2080,7 +2080,7 @@ static int post_check_errors()
 	return err_code;
 }
 
-int proxy_dup_default_conf_errors(struct proxy *curpx, struct proxy *defpx, char **errmsg)
+int proxy_dup_default_conf_errors(struct proxy *curpx, const struct proxy *defpx, char **errmsg)
 {
 	struct conf_errors *conf_err, *new_conf_err = NULL;
 	int ret = 0;