r4341 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-11-04 10:38:08 +0100 (Wed, 04 Nov 2009)
New Revision: 4341

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
Log:
Add missing bit of r4183

This bit got missing when we merged the new epoll acceptor for 2.0.

Disable SO_LINGER when we time out a connection due to sess_timeout,
so that we do not RST connections that have still not transmitted
their data.

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c	2009-11-03 09:32:45 UTC (rev 4340)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c	2009-11-04 09:38:08 UTC (rev 4341)
@@ -192,6 +192,7 @@
 			if (sp->t_open > deadline)
 				break;
 			VTAILQ_REMOVE(&sesshead, sp, list);
+			TCP_linger(sp->fd, 0);
 			vca_close_session(sp, "timeout");
 			SES_Delete(sp);
 		}