Merge r3408:

Check ECONNRESET

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

diff --git a/varnish-cache/bin/varnishtest/vtc_server.c b/varnish-cache/bin/varnishtest/vtc_server.c
index e01a04ba068a5ac9cf5c8acde5da822af2841cac..00e86b5ac3e75a9a9d4957ac4cad78ec0e6da21e 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_server.c
+++ b/varnish-cache/bin/varnishtest/vtc_server.c
@@ -97,7 +97,8 @@ server_thread(void *priv)
                vtc_log(vl, 3, "Accepted socket fd is %d", fd);
                http_process(vl, s->spec, fd, 0);
                vtc_log(vl, 3, "shutting fd %d", fd);
-               assert((shutdown(fd, SHUT_WR) == 0) || errno == ENOTCONN);
+               assert((shutdown(fd, SHUT_WR) == 0)
+                   || errno == ENOTCONN || errno == ECONNRESET);
                TCP_close(&fd);
        }
        vtc_log(vl, 2, "Ending");