[MEDIUM] introduce separation between contimeout, and tarpit + queue
Now the connect timeout, tarpit timeout and queue timeout are
distinct. In order to retain compatibility with older versions,
if either queue or tarpit is left unset both in the proxy and
in the default proxy, then it is inherited from the connect
timeout as before.
diff --git a/src/backend.c b/src/backend.c
index 1eed377..57b421c 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1460,8 +1460,8 @@
return 1;
case SRV_STATUS_QUEUED:
- /* FIXME-20060503 : we should use the queue timeout instead */
- if (!tv_add_ifset(&t->req->cex, &now, &t->be->contimeout))
+ /* note: we use the connect expiration date for the queue. */
+ if (!tv_add_ifset(&t->req->cex, &now, &t->be->timeout.queue))
tv_eternity(&t->req->cex);
t->srv_state = SV_STIDLE;
/* do nothing else and do not wake any other session up */