diff --git a/SOURCES/rhbz1941446-fix-short-http-responses.patch b/SOURCES/rhbz1941446-fix-short-http-responses.patch new file mode 100644 index 0000000..59c3107 --- /dev/null +++ b/SOURCES/rhbz1941446-fix-short-http-responses.patch @@ -0,0 +1,25 @@ +From eaf1d768085a924a5322cfc77439ba5a4945bbae Mon Sep 17 00:00:00 2001 +From: Ryan O'Hara +Date: Thu, 14 Oct 2021 14:08:39 -0500 +Subject: [PATCH] Fix short HTTP responses to client + +--- + src/raw_sock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raw_sock.c b/src/raw_sock.c +index ad0210105..fbf20ae35 100644 +--- a/src/raw_sock.c ++++ b/src/raw_sock.c +@@ -302,7 +302,7 @@ static int raw_sock_to_buf(struct connection *conn, struct buffer *buf, int coun + if (ret > 0) { + buf->i += ret; + done += ret; +- if (ret < try) { ++ if (0 && ret < try) { + /* unfortunately, on level-triggered events, POLL_HUP + * is generally delivered AFTER the system buffer is + * empty, unless the poller supports POLL_RDHUP. If +-- +2.31.1 + diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index 8255a7b..3fe5bd5 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 1.8.27 -Release: 2%{?dist} +Release: 4%{?dist} Summary: HAProxy reverse proxy for high availability environments Group: System Environment/Daemons @@ -23,6 +23,7 @@ Source4: %{name}.sysconfig Source5: halog.1 Patch0: rhbz1838319-mworker-fix-again-copy_argv.patch +Patch1: rhbz1941446-fix-short-http-responses.patch BuildRequires: lua-devel BuildRequires: pcre-devel @@ -53,6 +54,7 @@ availability environments. Indeed, it can: %prep %setup -q %patch0 -p1 +%patch1 -p1 %build regparm_opts= @@ -138,6 +140,12 @@ exit 0 %{_mandir}/man1/* %changelog +* Tue Jan 18 2022 Ryan O'Hara - 1.8.27-3 +- Apply patch (#1941446) + +* Fri Oct 15 2021 Ryan O'Hara - 1.8.27-3 +- Fix short HTTP responses (#1941446) + * Thu Dec 17 2020 Ryan O'Hara - 1.8.27-2 - Fix copy_argv for arguments that begin with hypen (#1838319)