[master] 5655325 Use VTCP_Check() when expecting close.

Poul-Henning Kamp phk at varnish-cache.org
Thu Oct 31 11:16:29 CET 2013


commit 565532550aa4888690d1d12518db7dbe6735b691
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Oct 31 10:16:15 2013 +0000

    Use VTCP_Check() when expecting close.

diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 5686ff0..63b02e6 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1064,7 +1064,7 @@ cmd_http_expect_close(CMD_ARGS)
 			    "Expected close: poll = %d, revents = 0x%x",
 			    i, fds[0].revents);
 		i = read(hp->fd, &c, 1);
-		if (i == 0)
+		if (VTCP_Check(i))
 			break;
 		if (i == 1 && vct_islws(c))
 			continue;



More information about the varnish-commit mailing list