[master] 415c7d8 Improve EOF detection.

Poul-Henning Kamp phk at FreeBSD.org
Sun May 17 10:28:22 CEST 2015


commit 415c7d8e824f6265ce08d6dcb8c6916a8f674099
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun May 17 08:27:09 2015 +0000

    Improve EOF detection.

diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 8464662..5a291dc 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1217,7 +1217,7 @@ cmd_http_expect_close(CMD_ARGS)
 		i = poll(fds, 1, hp->timeout);
 		if (i == 0)
 			vtc_log(vl, hp->fatal, "Expected close: timeout");
-		if (i != 1 || !(fds[0].revents & POLLIN))
+		if (i != 1 || !(fds[0].revents & (POLLIN|POLLERR)))
 			vtc_log(vl, hp->fatal,
 			    "Expected close: poll = %d, revents = 0x%x",
 			    i, fds[0].revents);



More information about the varnish-commit mailing list