mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: listener: close before free in listener_accept

Browse Source 
safer to close handle before the object is put back in the global pool.

this was introduced by commit 9378bbe0bef4005155d ("MEDIUM: listener:
use protocol->accept_conn() to accept a connection")

this should fix github issue #902

no backport needed.

Signed-off-by: William Dauchy <wdauchy@gmail.com>
This commit is contained in:
William Dauchy 2020-10-18 18:37:43 +02:00 committed by Willy Tarreau
parent f42d794d96
commit 835712ad90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/listener.c
View File

@ -855,8 +855,8 @@ void listener_accept(struct listener *l)
send_log(p, LOG_EMERG,
"Proxy %s reached the configured maximum connection limit. Please check the global 'maxconn' value.\n",
p->id);
conn_free(cli_conn);
close(cli_conn->handle.fd);
conn_free(cli_conn);
expire = tick_add(now_ms, 1000); /* try again in 1 second */
goto limit_global;
}