mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

* a never ending connect() could lead to a fast select() loop if

Browse Source 
its timeout times the number of retransmits exceeded the server
  read or write timeout, because the later was used to compute
  select()'s timeout while the connection timeout was not reached.
This commit is contained in:
Willy TARREAU 2006-03-01 22:33:49 +01:00
parent c9a643998f
commit 1cec83c754
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
haproxy.c
View File

@ -2345,13 +2345,18 @@ int event_srv_write(int fd) {
fdtab[fd].state = FD_STERROR;
}
if (s->proxy->srvtimeout) {
tv_delayfrom(&s->swexpire, &now, s->proxy->srvtimeout);
/* FIXME: to avoid the server to read-time-out during writes, we refresh it */
s->srexpire = s->swexpire;
/* We don't want to re-arm read/write timeouts if we're trying to connect,
* otherwise it could loop indefinitely !
*/
if (s->srv_state != SV_STCONN) {
if (s->proxy->srvtimeout) {
tv_delayfrom(&s->swexpire, &now, s->proxy->srvtimeout);
/* FIXME: to avoid the server to read-time-out during writes, we refresh it */
s->srexpire = s->swexpire;
}
else
tv_eternity(&s->swexpire);
}
else
tv_eternity(&s->swexpire);
task_wakeup(&rq, t);
return 0;
@ -4946,6 +4951,14 @@ int process_session(struct task *t) {
/* restore t to its place in the task list */
task_queue(t);
#ifdef DEBUG_FULL
/* DEBUG code : this should never ever happen, otherwise it indicates
* that a task still has something to do and will provoke a quick loop.
*/
if (tv_remain2(&now, &t->expire) <= 0)
exit(100);
#endif
return tv_remain2(&now, &t->expire); /* nothing more to do */
}