MINOR: stream-int/txn: Move buffer for L7 retries in the HTTP transaction
The L7 retries only concerns the stream when a server connection is
established. Thus instead of storing the L7 buffer into the
stream-interface, it may be moved to the stream. And because it is only
available for HTTP streams, it may be moved in the HTTP transaction.
Associated flags are also moved into the HTTP transaction.
diff --git a/src/http_act.c b/src/http_act.c
index eebc188..f35fadf 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -752,19 +752,17 @@
/* This function executes the "disable-l7-retry" HTTP action.
* It disables L7 retries (all retry except for a connection failure). This
* can be useful for example to avoid retrying on POST requests.
- * It just removes the L7 retry flag on the stream_interface, and always
+ * It just removes the L7 retry flag on the HTTP transaction, and always
* return ACT_RET_CONT;
*/
static enum act_return http_req_disable_l7_retry(struct act_rule *rule, struct proxy *px,
struct session *sess, struct stream *s, int flags)
{
- struct stream_interface *si = cs_si(s->csb);
-
- /* In theory, the SI_FL_L7_RETRY flags isn't set at this point, but
+ /* In theory, the TX_L7_RETRY flags isn't set at this point, but
* let's be future-proof and remove it anyway.
*/
- si->flags &= ~SI_FL_L7_RETRY;
- si->flags |= SI_FL_D_L7_RETRY;
+ s->txn->flags &= ~TX_L7_RETRY;
+ s->txn->flags |= TX_D_L7_RETRY;
return ACT_RET_CONT;
}