mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-15 22:51:00 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: listeners: remove unused timeout

Browse Source 
Listerner->timeout is a vestigal thing going back to 2007 or so. It
used to only be used by stats and peers frontends to hold a pointer
to the proxy's client timeout. Now that we use regular frontends, we
don't use it anymore.
This commit is contained in:
Willy Tarreau 2015-03-13 16:25:15 +01:00
parent d1d48d4bb3
commit 512fd00296
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/listener.h
View File

@ -172,7 +172,6 @@ struct listener {
struct list proto_list; /* list in the protocol header */
int (*accept)(struct listener *l, int fd, struct sockaddr_storage *addr); /* upper layer's accept() */
struct task * (*handler)(struct task *t); /* protocol handler. It is a task */
int *timeout; /* pointer to client-side timeout */
struct proxy *frontend; /* the frontend this listener belongs to, or NULL */
struct list wait_queue; /* link element to make the listener wait for something (LI_LIMITED) */
unsigned int analysers; /* bitmap of required protocol analysers */

2
src/cfgparse.c
View File

@ -1884,7 +1884,6 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
l->maxaccept = 1;
l->maxconn = ((struct proxy *)curpeers->peers_fe)->maxconn;
l->backlog = ((struct proxy *)curpeers->peers_fe)->backlog;
l->timeout = &((struct proxy *)curpeers->peers_fe)->timeout.client;
l->accept = session_accept;
l->handler = process_session;
l->analysers |= ((struct proxy *)curpeers->peers_fe)->fe_req_ana;
@ -7708,7 +7707,6 @@ out_uri_auth_compat:
listener->maxaccept = (listener->maxaccept + nbproc - 1) / nbproc;
}
listener->timeout = &curproxy->timeout.client;
listener->accept = session_accept;
listener->handler = process_session;
listener->analysers |= curproxy->fe_req_ana;

1
src/dumpstats.c
View File

@ -337,7 +337,6 @@ static int stats_parse_global(char **args, int section_type, struct proxy *curpx
list_for_each_entry(l, &bind_conf->listeners, by_bind) {
l->maxconn = global.stats_fe->maxconn;
l->backlog = global.stats_fe->backlog;
l->timeout = &global.stats_fe->timeout.client;
l->accept = session_accept;
l->handler = process_session;
l->options |= LI_O_UNLIMITED; /* don't make the peers subject to global limits */