r2839 - trunk/varnish-cache/bin/varnishtest

phk at projects.linpro.no phk at projects.linpro.no
Fri Jun 27 00:12:23 CEST 2008


Author: phk
Date: 2008-06-27 00:12:23 +0200 (Fri, 27 Jun 2008)
New Revision: 2839

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_server.c
Log:
Close servers TCP connection more gracefully for EOF handling.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c	2008-06-26 21:42:05 UTC (rev 2838)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c	2008-06-26 22:12:23 UTC (rev 2839)
@@ -80,6 +80,7 @@
 	struct sockaddr_storage addr_s;
 	struct sockaddr *addr;
 	socklen_t l;
+	char c;
 
 
 	CAST_OBJ_NOTNULL(s, priv, SERVER_MAGIC);
@@ -96,6 +97,11 @@
 		fd = accept(s->sock, addr, &l);
 		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);
+		AZ(shutdown(fd, SHUT_WR));
+		while (1 == read(fd, &c, 1))
+			continue;
+		vtc_log(vl, 3, "closing fd %d", fd);
 		AZ(close(fd));
 	}
 	vtc_log(vl, 2, "Ending");




More information about the varnish-commit mailing list