From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 26 Jun 2008 22:55:25 +0000 (+0000)
Subject: Be even more careful with server fd's
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce05174f4eefb54fce8eda74f33a318dcf4f014;p=varnish

Be even more careful with server fd's



git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2843 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishtest/vtc_server.c b/varnish-cache/bin/varnishtest/vtc_server.c
index ee488660..d361eacf 100644
--- a/varnish-cache/bin/varnishtest/vtc_server.c
+++ b/varnish-cache/bin/varnishtest/vtc_server.c
@@ -97,7 +97,7 @@ server_thread(void *priv)
 		http_process(vl, s->spec, fd, 0);
 		vtc_log(vl, 3, "shutting fd %d", fd);
 		AZ(shutdown(fd, SHUT_WR));
-		AZ(shutdown(fd, SHUT_RD));
+		AZ(close(fd));
 	}
 	vtc_log(vl, 2, "Ending");
 	return (NULL);
diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c
index b8e6897e..e2d41305 100644
--- a/varnish-cache/bin/varnishtest/vtc_varnish.c
+++ b/varnish-cache/bin/varnishtest/vtc_varnish.c
@@ -205,6 +205,8 @@ varnish_launch(struct varnish *v)
 		AZ(close(v->fds[1]));
 		AZ(close(v->fds[2]));
 		AZ(close(v->fds[3]));
+		for (i = 3; i <getdtablesize(); i++)
+			close(i);
 		AZ(execl("/bin/sh", "/bin/sh", "-c", vsb_data(vsb), NULL));
 		exit(1);
 	}