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

DEV: tcploop: do not report an error on POLLERR

Browse Source 
Actually this breaks certain client tests where the server closes with
RST, it prevents from reading the final data so better not abort on
that.
This commit is contained in:
Willy Tarreau 2022-11-25 17:04:05 +01:00
parent e5f72b8754
commit fd0974cf3f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/tcploop/tcploop.c
View File

@ -306,7 +306,7 @@ int addr_to_ss(const char *str, struct sockaddr_storage *ss, struct err_msg *err
}
/* waits up to <ms> milliseconds on fd <fd> for events <events> (POLLIN|POLLRDHUP|POLLOUT).
* returns poll's status, or -2 if the poller sets POLLERR.
* returns poll's status.
*/
int wait_on_fd(int fd, int events, int ms)
{
@ -319,8 +319,6 @@ int wait_on_fd(int fd, int events, int ms)
ret = poll(&pollfd, 1, ms);
} while (ret == -1 && errno == EINTR);
if (ret == 1 && pollfd.revents & POLLERR)
ret = -2;
return ret;
}