From b7274e69ef923612a1e992d7b53dc1a4f5b80e58 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Fri, 22 Dec 2023 16:26:07 +0100 Subject: [PATCH] Revert "MINOR: mux-quic: Disable zero-copy forwarding for send by default" This reverts commit 18f2ccd244f555348b0d5920e3b71286f1e7b04b. Found issues related to QUIC fast-forward were resolved (see github issue #2372). Reenable it by default. If any issue arises, it can be disabled using the global statement : tune.quit.zero-copy-fwd-send off This can be backported to 2.9, but only after a sensible period of observation. --- doc/configuration.txt | 2 +- src/haproxy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 3ec385e62b3b..97602c88e1f0 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -3652,7 +3652,7 @@ tune.quic.socket-owner { connection | listener } tune.quic.zero-copy-fwd-send { on | off } Enables ('on') of disabled ('off') the zero-copy sends of data for the QUIC - multiplexer. It is disabled by default. + multiplexer. It is enabled by default. See also: tune.disable-zero-copy-forwarding diff --git a/src/haproxy.c b/src/haproxy.c index 0807e87b4313..e18632554224 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -1601,7 +1601,7 @@ static void init_args(int argc, char **argv) global.tune.options |= GTUNE_USE_FAST_FWD; /* Use fast-forward by default */ /* Use zero-copy forwarding by default */ - global.tune.no_zero_copy_fwd = NO_ZERO_COPY_FWD_QUIC_SND; + global.tune.no_zero_copy_fwd = 0; /* keep a copy of original arguments for the master process */ old_argv = copy_argv(argc, argv);