]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: config: Copy default error messages when parsing of a backend starts
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 12 Nov 2018 10:57:31 +0000 (11:57 +0100)
committerWilly Tarreau <w@1wt.eu>
Sun, 18 Nov 2018 05:17:03 +0000 (06:17 +0100)
To be used, error messages declared in a default section must be copied when the
parsing of a proxy section starts. But this was only done for frontends.

This patch may be backported to older versions.

src/cfgparse.c

index cef5e3979cd2ed9093283addfa161c5a836503e5..ab330a901127e91764d650ef73d07af2d476a29d 100644 (file)
@@ -2834,15 +2834,15 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
                        curproxy->server_id_hdr_name = strdup(defproxy.server_id_hdr_name);
                }
 
+               /* initialize error relocations */
+               for (rc = 0; rc < HTTP_ERR_SIZE; rc++)
+                       chunk_dup(&curproxy->errmsg[rc], &defproxy.errmsg[rc]);
+
                if (curproxy->cap & PR_CAP_FE) {
                        curproxy->maxconn = defproxy.maxconn;
                        curproxy->backlog = defproxy.backlog;
                        curproxy->fe_sps_lim = defproxy.fe_sps_lim;
 
-                       /* initialize error relocations */
-                       for (rc = 0; rc < HTTP_ERR_SIZE; rc++)
-                               chunk_dup(&curproxy->errmsg[rc], &defproxy.errmsg[rc]);
-
                        curproxy->to_log = defproxy.to_log & ~LW_COOKIE & ~LW_REQHDR & ~ LW_RSPHDR;
                }