MINOR: stream-int: add a new flag to mention that we want the connection to be killed
The new flag SI_FL_KILL_CONN is now set by the rare actions which
deliberately want the whole connection (and not just the stream) to be
killed. This is only used for "tcp-request content reject",
"tcp-response content reject", "tcp-response content close" and
"http-request reject". The purpose is to desambiguate the close from
a regular shutdown. This will be used by the next patches.
diff --git a/src/http_act.c b/src/http_act.c
index 37cf435..4f51d4a 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -34,6 +34,7 @@
#include <proto/http_rules.h>
#include <proto/log.h>
#include <proto/proto_http.h>
+#include <proto/stream_interface.h>
/* This function executes one of the set-{method,path,query,uri} actions. It
@@ -185,6 +186,7 @@
static enum act_return http_action_reject(struct act_rule *rule, struct proxy *px,
struct session *sess, struct stream *s, int flags)
{
+ si_must_kill_conn(chn_prod(&s->req));
channel_abort(&s->req);
channel_abort(&s->res);
s->req.analysers = 0;
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 602749c..91f98b0 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -163,6 +163,7 @@
break;
}
else if (rule->action == ACT_ACTION_DENY) {
+ si_must_kill_conn(chn_prod(req));
channel_abort(req);
channel_abort(&s->res);
req->analysers = 0;
@@ -342,6 +343,7 @@
break;
}
else if (rule->action == ACT_ACTION_DENY) {
+ si_must_kill_conn(chn_prod(rep));
channel_abort(rep);
channel_abort(&s->req);
rep->analysers = 0;
@@ -359,6 +361,7 @@
}
else if (rule->action == ACT_TCP_CLOSE) {
chn_prod(rep)->flags |= SI_FL_NOLINGER | SI_FL_NOHALF;
+ si_must_kill_conn(chn_prod(rep));
si_shutr(chn_prod(rep));
si_shutw(chn_prod(rep));
break;