net/haproxy/patches/0006-BUG-MEDIUM-http-don-t-enable-auto-close-on-the-respo.patch

   1 From 3de8e7ab8d9125402cc1a8fb48ee475ee21d7d4c Mon Sep 17 00:00:00 2001
   2 From: Willy Tarreau <w@1wt.eu>
   3 Date: Wed, 25 Nov 2015 20:11:11 +0100
   4 Subject: [PATCH 06/10] BUG/MEDIUM: http: don't enable auto-close on the
   5  response side
   6
   7 There is a bug where "option http-keep-alive" doesn't force a response
   8 to stay in keep-alive if the server sends the FIN along with the response
   9 on the second or subsequent response. The reason is that the auto-close
  10 was forced enabled when recycling the HTTP transaction and it's never
  11 disabled along the response processing chain before the SHUTR gets a
  12 chance to be forwarded to the client side. The MSG_DONE state of the
  13 HTTP response properly disables it but too late.
  14
  15 There's no more reason for enabling auto-close here, because either it
  16 doesn't matter in non-keep-alive modes because the connection is closed,
  17 or it is automatically enabled by process_stream() when it sees there's
  18 no analyser on the stream.
  19
  20 This bug also affects 1.5 so a backport is desired.
  21 (cherry picked from commit 714ea78c9a09fe6a35a1f2d86af8f7fc9abb64d1)
  22 (cherry picked from commit a15091be17f27fcf4e3a84338df1a8b732e396a1)
  23 ---
  24  src/proto_http.c | 6 ++++--
  25  1 file changed, 4 insertions(+), 2 deletions(-)
  26
  27 diff --git a/src/proto_http.c b/src/proto_http.c
  28 index b32e778..5facfbb 100644
  29 --- a/src/proto_http.c
  30 +++ b/src/proto_http.c
  31 @@ -4946,11 +4946,13 @@ void http_end_txn_clean_session(struct session *s)
  32                         s->rep->flags |= CF_EXPECT_MORE;
  33         }
  34
  35 -       /* we're removing the analysers, we MUST re-enable events detection */
  36 +       /* we're removing the analysers, we MUST re-enable events detection.
  37 +        * We don't enable close on the response channel since it's either
  38 +        * already closed, or in keep-alive with an idle connection handler.
  39 +        */
  40         channel_auto_read(s->req);
  41         channel_auto_close(s->req);
  42         channel_auto_read(s->rep);
  43 -       channel_auto_close(s->rep);
  44
  45         /* we're in keep-alive with an idle connection, monitor it */
  46         si_idle_conn(s->req->cons);
  47 --
  48 2.4.10
  49