MINOR: channel: Forwad close to other side on abort
Most of calls to channel_abort() are associated to a call to
channel_auto_close(). Others are in areas where the auto close is the
default. So, it is now systematically enabled when an abort is performed on
a channel, as part of channel_abort() function.
diff --git a/include/haproxy/channel.h b/include/haproxy/channel.h
index 1bf21c7..44728bb 100644
--- a/include/haproxy/channel.h
+++ b/include/haproxy/channel.h
@@ -565,6 +565,7 @@
{
chn_prod(chn)->flags |= SC_FL_SHUTR_NOW;
chn_cons(chn)->flags |= SC_FL_SHUTW_NOW;
+ chn->flags |= CF_AUTO_CLOSE;
chn->flags &= ~CF_AUTO_CONNECT;
}
diff --git a/src/hlua.c b/src/hlua.c
index 6bbf5c9..913b237 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -8158,7 +8158,6 @@
channel_auto_read(req);
channel_abort(req);
- channel_auto_close(req);
channel_erase(req);
channel_auto_read(res);
diff --git a/src/http_ana.c b/src/http_ana.c
index bee658f..4dc1b52 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -4446,7 +4446,6 @@
channel_auto_read(req);
channel_abort(req);
- channel_auto_close(req);
channel_htx_erase(req, htxbuf(&req->buf));
channel_auto_read(res);
@@ -4511,7 +4510,6 @@
channel_auto_read(&s->req);
channel_abort(&s->req);
- channel_auto_close(&s->req);
channel_htx_erase(&s->req, htxbuf(&s->req.buf));
channel_auto_read(&s->res);
channel_auto_close(&s->res);
diff --git a/src/stream.c b/src/stream.c
index f8fc062..5afef6c 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -846,7 +846,6 @@
channel_auto_read(ic);
channel_abort(ic);
- channel_auto_close(ic);
channel_erase(ic);
channel_truncate(oc);