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

MINOR: stconn: Don't clear SE_FL_ERROR when endpoint is reset

Browse Source 
There is no reason to remove this flag. When the SC endpoint is reset, it is
replaced by a new one. The old one is released. It was useful when the new
endpoint inherited some flags from the old one.  But it is no longer
performed. Thus there is no reason still unset this flag.
This commit is contained in:
Christopher Faulet 2023-04-14 10:28:28 +02:00
parent e8bcef5f22
commit 638fe6ab0f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stconn.c
View File

@ -437,9 +437,6 @@ void sc_destroy(struct stconn *sc)
/* Resets the stream connector endpoint. It happens when the app layer want to renew /* Resets the stream connector endpoint. It happens when the app layer want to renew
* its endpoint. For a connection retry for instance. If a mux or an applet is * its endpoint. For a connection retry for instance. If a mux or an applet is
* attached, a new endpoint is created. Returns -1 on error and 0 on success. * attached, a new endpoint is created. Returns -1 on error and 0 on success.
*
* Only SE_FL_ERROR flag is removed on the endpoint. Orther flags are preserved.
* It is the caller responsibility to remove other flags if needed.
*/ */
int sc_reset_endp(struct stconn *sc) int sc_reset_endp(struct stconn *sc)
{ {
@ -447,7 +444,6 @@ int sc_reset_endp(struct stconn *sc)
BUG_ON(!sc->app); BUG_ON(!sc->app);
sc_ep_clr(sc, SE_FL_ERROR);
if (!__sc_endp(sc)) { if (!__sc_endp(sc)) {
/* endpoint not attached or attached to a mux with no /* endpoint not attached or attached to a mux with no
* target. Thus the endpoint will not be release but just * target. Thus the endpoint will not be release but just
@ -461,10 +457,8 @@ int sc_reset_endp(struct stconn *sc)
/* allocate the new endpoint first to be able to set error if it /* allocate the new endpoint first to be able to set error if it
* fails */ * fails */
new_sd = sedesc_new(); new_sd = sedesc_new();
if (!unlikely(new_sd)) { if (!unlikely(new_sd))
sc_ep_set(sc, SE_FL_ERROR);
return -1; return -1;
}
/* The app is still attached, the sc will not be released */ /* The app is still attached, the sc will not be released */
sc_detach_endp(&sc); sc_detach_endp(&sc);