diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:34 +0000 |
| commit | f3bb08bb1d94c77704371f8546a739119f0a05b4 (patch) | |
| tree | 5dfb47fa424ecde655f8950098411a311e9296e6 /src/cfgparse.c | |
| parent | Releasing progress-linux version 2.9.6-1~progress7.99u1. (diff) | |
| download | haproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.tar.xz haproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.zip | |
Merging upstream version 2.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | src/cfgparse.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/cfgparse.c b/src/cfgparse.c index 2744f97..bee3040 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -3434,12 +3434,12 @@ out_uri_auth_compat: LOG_OPT_MANDATORY|LOG_OPT_MERGE_SPACES, SMP_VAL_FE_LOG_END, &err)) { ha_alert("Parsing [%s:%d]: failed to parse log-format-sd : %s.\n", - curproxy->conf.lfs_file, curproxy->conf.lfs_line, err); + curproxy->conf.lfsd_file, curproxy->conf.lfsd_line, err); free(err); cfgerr++; } else if (!add_to_logformat_list(NULL, NULL, LF_SEPARATOR, &curproxy->logformat_sd, &err)) { ha_alert("Parsing [%s:%d]: failed to parse log-format-sd : %s.\n", - curproxy->conf.lfs_file, curproxy->conf.lfs_line, err); + curproxy->conf.lfsd_file, curproxy->conf.lfsd_line, err); free(err); cfgerr++; } @@ -3964,13 +3964,21 @@ out_uri_auth_compat: int mode = conn_pr_mode_to_proto_mode(curproxy->mode); const struct mux_proto_list *mux_ent; - if (!bind_conf->mux_proto) { - /* No protocol was specified. If we're using QUIC at the transport - * layer, we'll instantiate it as a mux as well. If QUIC is not - * compiled in, this will remain NULL. - */ - if (bind_conf->xprt && bind_conf->xprt == xprt_get(XPRT_QUIC)) + if (bind_conf->xprt && bind_conf->xprt == xprt_get(XPRT_QUIC)) { + if (!bind_conf->mux_proto) { + /* No protocol was specified. If we're using QUIC at the transport + * layer, we'll instantiate it as a mux as well. If QUIC is not + * compiled in, this will remain NULL. + */ bind_conf->mux_proto = get_mux_proto(ist("quic")); + } + if (bind_conf->options & BC_O_ACC_PROXY) { + ha_alert("Binding [%s:%d] for %s %s: QUIC protocol does not support PROXY protocol yet." + " 'accept-proxy' option cannot be used with a QUIC listener.\n", + bind_conf->file, bind_conf->line, + proxy_type_str(curproxy), curproxy->id); + cfgerr++; + } } if (!bind_conf->mux_proto) |