mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-11 05:54:39 +00:00
MINOR: http-rules: Handle the rule direction when a redirect is evaluated
The rule direction must be tested to do specific processing on the request path. intercepted_req counter shoud be updated if the rule is evaluated on the frontend and remaining request's analyzers must be removed. But only on the request path. The rule direction must also be tested to set the right final stream state flag. This patch depends on the commit "MINOR: http-rules: Add a flag on redirect rules to know the rule direction". Both must be backported to all stable versions.
This commit is contained in:
parent
c87e468816
commit
60b33a5a62
@ -2663,9 +2663,6 @@ int http_apply_redirect_rule(struct redirect_rule *rule, struct stream *s, struc
|
||||
|
||||
htx_to_buf(htx, &res->buf);
|
||||
|
||||
/* let's log the request time */
|
||||
s->logs.tv_request = now;
|
||||
|
||||
htx->flags |= HTX_FL_PROXY_RESP;
|
||||
data = htx->data - co_data(res);
|
||||
c_adv(res, data);
|
||||
@ -2681,13 +2678,19 @@ int http_apply_redirect_rule(struct redirect_rule *rule, struct stream *s, struc
|
||||
channel_auto_read(res);
|
||||
channel_auto_close(res);
|
||||
channel_shutr_now(res);
|
||||
|
||||
if (rule->flags & REDIRECT_FLAG_FROM_REQ) {
|
||||
/* let's log the request time */
|
||||
s->logs.tv_request = now;
|
||||
req->analysers &= AN_REQ_FLT_END;
|
||||
|
||||
if (s->sess->fe == s->be) /* report it if the request was intercepted by the frontend */
|
||||
_HA_ATOMIC_ADD(&s->sess->fe->fe_counters.intercepted_req, 1);
|
||||
}
|
||||
|
||||
if (!(s->flags & SF_ERR_MASK))
|
||||
s->flags |= SF_ERR_LOCAL;
|
||||
if (!(s->flags & SF_FINST_MASK))
|
||||
s->flags |= SF_FINST_R;
|
||||
s->flags |= ((rule->flags & REDIRECT_FLAG_FROM_REQ) ? SF_FINST_R : SF_FINST_H);
|
||||
|
||||
free_trash_chunk(chunk);
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user