From: tfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Wed, 28 Jan 2009 15:09:40 +0000 (+0000)
Subject: Merge r3492:
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster-2.0;p=varnish

Merge r3492:

Be more stringent about our timeout: fail even if we did get a
socket, but took to.



git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/branches/2.0@3563 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache_backend_poll.c b/varnish-cache/bin/varnishd/cache_backend_poll.c
index 659ba2bd..67b6a13a 100644
--- a/varnish-cache/bin/varnishd/cache_backend_poll.c
+++ b/varnish-cache/bin/varnishd/cache_backend_poll.c
@@ -157,6 +157,11 @@ vbp_poke(struct vbp_target *vt)
 		/* Got no connection: failed */
 		return;
 	}
+	if (tmo <= 0) {
+		/* Spent too long time getting it */
+		TCP_close(&s);
+		return;
+	}
 
 	/* Send the request */
 	i = write(s, vt->req, vt->req_len);