mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-02-12 08:40:29 +01:00
parent b2ec994523
commit 016255a483
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/http_htx.h
View File

@ -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_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_errorfile(int status, const char *file, char **errmsg);
struct buffer *http_parse_errorloc(int errloc, int status, const char *url, 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); void proxy_release_conf_errors(struct proxy *px);
#endif /* _HAPROXY_HTTP_HTX_H */ #endif /* _HAPROXY_HTTP_HTX_H */

2
src/http_htx.c
View File

@ -2080,7 +2080,7 @@ static int post_check_errors()
return err_code; 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; struct conf_errors *conf_err, *new_conf_err = NULL;
int ret = 0; int ret = 0;