[master] 9042625 This silly bugger has now checked the arguments to Lck_CondWait()
Poul-Henning Kamp
phk at FreeBSD.org
Wed Mar 29 19:47:05 CEST 2017
commit 90426253ab8f9fe706bce4f3d3d7e3da52b40583
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Mar 29 17:46:05 2017 +0000
This silly bugger has now checked the arguments to Lck_CondWait()
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index 3725586..c1dee52 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -38,6 +38,7 @@
#include "http2/cache_http2.h"
#include "vend.h"
+#include "vtim.h"
static const char h2_resp_101[] =
"HTTP/1.1 101 Switching Protocols\r\n"
@@ -340,7 +341,7 @@ h2_new_session(struct worker *wrk, void *arg)
VTAILQ_FOREACH(r2, &h2->streams, list)
VSLb(h2->vsl, SLT_Debug, "ST %u %d", r2->stream, r2->state);
Lck_Lock(&h2->sess->mtx);
- (void)Lck_CondWait(h2->cond, &h2->sess->mtx, .1);
+ (void)Lck_CondWait(h2->cond, &h2->sess->mtx, VTIM_real() + .1);
Lck_Unlock(&h2->sess->mtx);
}
h2->cond = NULL;
More information about the varnish-commit
mailing list