mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stconn: Remove half-closed timeout

Browse Source 
The half-closed timeout is now directly retrieved from the proxy
settings. There is no longer usage for the .hcto field in the stconn
structure. So let's remove it.
This commit is contained in:
Christopher Faulet 2023-02-20 08:41:55 +01:00
parent bcdcfad3ff
commit be5cc766b0
5 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/stconn-t.h
View File

@ -241,7 +241,6 @@ struct stconn {
/* 2 bytes hole here */
unsigned int flags; /* SC_FL_* */
unsigned int hcto; /* half-closed timeout (0 = unset) */
unsigned int ioto; /* I/O activity timeout */
struct wait_event wait_event; /* We're in a wait list */
struct sedesc *sedesc; /* points to the stream endpoint descriptor */

2
src/cli.c
View File

@ -2830,8 +2830,6 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
s->req.analyse_exp = TICK_ETERNITY;
s->res.analyse_exp = TICK_ETERNITY;
s->scb->hcto = TICK_ETERNITY;
/* we're removing the analysers, we MUST re-enable events detection.
* We don't enable close on the response channel since it's either
* already closed, or in keep-alive with an idle connection handler.

3
src/proxy.c
View File

@ -2404,9 +2404,6 @@ int stream_set_backend(struct stream *s, struct proxy *be)
if (be->options2 & PR_O2_INDEPSTR)
s->scb->flags |= SC_FL_INDEP_STR;
if (tick_isset(be->timeout.serverfin))
s->scb->hcto = be->timeout.serverfin;
/* We want to enable the backend-specific analysers except those which
* were already run as part of the frontend/listener. Note that it would
* be more reliable to store the list of analysers that have been run,

2
src/stconn.c
View File

@ -135,7 +135,7 @@ static struct stconn *sc_new(struct sedesc *sedesc)
sc->obj_type = OBJ_TYPE_SC;
sc->flags = SC_FL_NONE;
sc->state = SC_ST_INI;
sc->ioto = sc->hcto = TICK_ETERNITY;
sc->ioto = TICK_ETERNITY;
sc->app = NULL;
sc->app_ops = NULL;
sc->src = NULL;

2
src/stream.c
View File

@ -478,12 +478,10 @@ struct stream *stream_new(struct session *sess, struct stconn *sc, struct buffer
goto out_fail_alloc_scb;
sc_set_state(s->scf, SC_ST_EST);
s->scf->hcto = sess->fe->timeout.clientfin;
if (likely(sess->fe->options2 & PR_O2_INDEPSTR))
s->scf->flags |= SC_FL_INDEP_STR;
s->scb->hcto = TICK_ETERNITY;
if (likely(sess->fe->options2 & PR_O2_INDEPSTR))
s->scb->flags |= SC_FL_INDEP_STR;