mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-10 03:41:24 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: muxes: garbage collect the reset() method.

Browse Source 
Now that connections aren't being reused when they failed, remove the
reset() method. It was unimplemented anywhere, except for H1 where it did
nothing, anyway.
This commit is contained in:
Olivier Houchard 2021-03-14 00:39:49 +01:00 committed by Willy Tarreau
parent bc5ce9201a
commit dae6975498
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,6 @@ struct mux_ops {
int (*avail_streams)(struct connection *conn); /* Returns the number of streams still available for a connection */
int (*used_streams)(struct connection *conn); /* Returns the number of streams in use on a connection. */
void (*destroy)(void *ctx); /* Let the mux know one of its users left, so it may have to disappear */
void (*reset)(struct connection *conn); /* Reset the mux, because we're re-trying to connect */
int (*ctl)(struct connection *conn, enum mux_ctl_type mux_ctl, void *arg); /* Provides information about the mux */
int (*takeover)(struct connection *conn, int orig_tid); /* Attempts to migrate the connection to the current thread */
unsigned int flags; /* some flags characterizing the mux's capabilities (MX_FL_*) */

6
src/mux_h1.c
View File

@ -2867,11 +2867,6 @@ struct task *h1_io_cb(struct task *t, void *ctx, unsigned int state)
return t;
}
static void h1_reset(struct connection *conn)
{
}
static int h1_wake(struct connection *conn)
{
struct h1c *h1c = conn->ctx;
@ -3849,7 +3844,6 @@ static const struct mux_ops mux_h1_ops = {
.shutr = h1_shutr,
.shutw = h1_shutw,
.show_fd = h1_show_fd,
.reset = h1_reset,
.ctl = h1_ctl,
.takeover = h1_takeover,
.flags = MX_FL_HTX,