r2843 - trunk/varnish-cache/bin/varnishtest

[phk at projects.linpro.no]

Author: phk
Date: 2008-06-27 00:55:25 +0200 (Fri, 27 Jun 2008)
New Revision: 2843

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_server.c
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Be even more careful with server fd's



Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c	2008-06-26 22:45:49 UTC (rev 2842)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c	2008-06-26 22:55:25 UTC (rev 2843)
@@ -97,7 +97,7 @@
 		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);

Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-06-26 22:45:49 UTC (rev 2842)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-06-26 22:55:25 UTC (rev 2843)
@@ -205,6 +205,8 @@
 		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);
 	}