[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-commit
Subject:    r3563 - branches/2.0/varnish-cache/bin/varnishd
From:       tfheen () projects ! linpro ! no (tfheen at projects ! linpro ! no)
Date:       2009-01-28 15:09:40
Message-ID: 20090128150940.63EFF28431 () projects ! linpro ! no
[Download RAW message or body]

Author: tfheen
Date: 2009-01-28 16:09:40 +0100 (Wed, 28 Jan 2009)
New Revision: 3563

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.c
Log:
Merge r3492:

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



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-01-28 14:40:37 UTC (rev 3562)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-01-28 15:09:40 UTC (rev 3563)
@@ -157,6 +157,11 @@
 		/* 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);


[prev in list] [next in list] [prev in thread] [next in thread]