[master] b30b535 In probes treat a poll timeout as a recv error

Federico G. Schwindt fgsch at lodoss.net
Sat Mar 12 00:23:03 CET 2016


commit b30b53544fa2d4f43c38c2a9036681a8da7fc5e9
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Mar 11 23:14:07 2016 +0000

    In probes treat a poll timeout as a recv error

diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 5693408..ea63abe 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -271,6 +271,8 @@ vbp_poke(struct vbp_target *vt)
 		if (tmo > 0)
 			i = poll(pfd, 1, tmo);
 		if (i == 0 || tmo <= 0) {
+			if (i == 0)
+				vt->err_recv |= 1;
 			VTCP_close(&s);
 			return;
 		}



More information about the varnish-commit mailing list