kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: stop connect timeout when connect succeeds

Browse Source 
If the connect succeeds exactly at the same millisecond as the connect
timeout is supposed to strike, the timeout is still considered while
data may have already be sent. This results in a new connection attempt
with no data and with the response being lost.

Note that in practice the only real-world situation where this is observed
is when connect timeouts are extremely low, too low for safe operations.
This bug was encountered with a 1ms connect timeout.

It is also present on 1.4 and needs to be fixed there too.
This commit is contained in:
Willy Tarreau 2012-05-20 10:38:46 +02:00
parent 9580d16e40
commit 8ae52cb144
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proto_tcp.c
View File

@ -564,6 +564,7 @@ static int tcp_connect_write(int fd)
fdtab[fd].cb[DIR_RD].f = si->sock.read;
fdtab[fd].cb[DIR_WR].f = si->sock.write;
fdtab[fd].state = FD_STREADY;
si->exp = TICK_ETERNITY;
out_wakeup:
task_wakeup(si->owner, TASK_WOKEN_IO);

12
src/sock_raw.c
View File

@ -323,8 +323,10 @@ static int sock_raw_read(int fd)
b_adv(b, fwd);
}
if (fdtab[fd].state == FD_STCONN)
if (fdtab[fd].state == FD_STCONN) {
fdtab[fd].state = FD_STREADY;
si->exp = TICK_ETERNITY;
}
b->flags |= BF_READ_PARTIAL;
b->total += ret;
@ -541,8 +543,10 @@ static int sock_raw_write_loop(struct stream_interface *si, struct buffer *b)
ret = send(si->fd, trash + ret + si->send_proxy_ofs, -si->send_proxy_ofs,
(b->flags & BF_OUT_EMPTY) ? 0 : MSG_MORE);
if (ret > 0) {
if (fdtab[si->fd].state == FD_STCONN)
if (fdtab[si->fd].state == FD_STCONN) {
fdtab[si->fd].state = FD_STREADY;
si->exp = TICK_ETERNITY;
}
si->send_proxy_ofs += ret; /* becomes zero once complete */
b->flags |= BF_WRITE_NULL; /* connect() succeeded */
@ -647,8 +651,10 @@ static int sock_raw_write_loop(struct stream_interface *si, struct buffer *b)
}
if (ret > 0) {
if (fdtab[si->fd].state == FD_STCONN)
if (fdtab[si->fd].state == FD_STCONN) {
fdtab[si->fd].state = FD_STREADY;
si->exp = TICK_ETERNITY;
}
b->flags |= BF_WRITE_PARTIAL;