MINOR: channel/stconn: Move rto/wto from the channel to the stconn
Read and write timeouts concerns the I/O. Thus, it is logical to move it into
the stconn. At the end, the stream is responsible to detect the timeouts. So
it is logcial to have these values in the stconn and not in the SE
descriptor. But it may change depending on the recfactoring.
So, now:
* scf->rto is used instead of req->rto
* scf->wto is used instead of res->wto
* scb->rto is used instead of res->rto
* scb->wto is used instead of req->wto
diff --git a/src/hlua.c b/src/hlua.c
index 3c19680..5ef1618 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -3016,10 +3016,8 @@
s = appctx_strm(container_of(peer, struct hlua_csk_ctx, xref)->appctx);
s->sess->fe->timeout.connect = tmout;
- s->req.rto = tmout;
- s->req.wto = tmout;
- s->res.rto = tmout;
- s->res.wto = tmout;
+ s->scf->rto = s->scf->wto = tmout;
+ s->scb->rto = s->scb->wto = tmout;
s->req.rex = tick_add_ifset(now_ms, tmout);
s->req.wex = tick_add_ifset(now_ms, tmout);
s->res.rex = tick_add_ifset(now_ms, tmout);
@@ -8086,7 +8084,7 @@
channel_auto_close(req);
channel_erase(req);
- res->wex = tick_add_ifset(now_ms, res->wto);
+ res->wex = tick_add_ifset(now_ms, s->scf->wto);
channel_auto_read(res);
channel_auto_close(res);
channel_shutr_now(res);