BUG/MINOR: stop connect timeout when connect succeeds
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.
diff --git a/src/sock_raw.c b/src/sock_raw.c
index 351195c..37524be 100644
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -323,8 +323,10 @@
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 @@
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 @@
}
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;