Skip to content

V
varnish-cache
Commit 644bf080 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Fix timeout calculation to give session-herding a chance. 

Fixes: #1857
parent a7216850
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
bin/varnishd/cache/cache_session.c
View file @ 644bf080
......@@ -230,10 +230,6 @@ SES_RxStuff(struct http_conn *htc, htc_complete_f *func,
*t2 = now;
return (HTC_S_COMPLETE);
}
if (tn < now) {
WS_ReleaseP(htc->ws, htc->rxbuf_b);
return (HTC_S_TIMEOUT);
}
if (hs == HTC_S_MORE) {
/* Working on it */
if (t1 != NULL && isnan(*t1))
......@@ -249,6 +245,8 @@ SES_RxStuff(struct http_conn *htc, htc_complete_f *func,
WS_ReleaseP(htc->ws, htc->rxbuf_b);
return (HTC_S_OVERFLOW);
}
if (tmo <= 0.0)
tmo = 1e-3;
i = VTCP_read(htc->fd, htc->rxbuf_e, i, tmo);
if (i == 0 || i == -1) {
WS_ReleaseP(htc->ws, htc->rxbuf_b);
......@@ -257,10 +255,14 @@ SES_RxStuff(struct http_conn *htc, htc_complete_f *func,
htc->rxbuf_e += i;
*htc->rxbuf_e = '\0';
} else if (i == -2) {
if (hs == HTC_S_EMPTY && ti < now) {
if (hs == HTC_S_EMPTY && ti <= now) {
WS_ReleaseP(htc->ws, htc->rxbuf_b);
return (HTC_S_IDLE);
}
if (tn <= now) {
WS_ReleaseP(htc->ws, htc->rxbuf_b);
return (HTC_S_TIMEOUT);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment