r4605 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-03-09 12:27:08 +0100 (Tue, 09 Mar 2010)
New Revision: 4605

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_pipe.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_ports.c
Log:
Stop messing with the linger bit, there are too many portability issues
and bugs right now.




Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -92,7 +92,7 @@
  * will return immediately.
  */
 static const struct linger linger = {
-	.l_onoff	=	1,
+	.l_onoff	=	0,
 };
 
 static unsigned char	need_sndtimeo, need_rcvtimeo, need_linger, need_test;

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -271,7 +271,7 @@
 		 * This is an orderly close of the connection; ditch nolinger
 		 * before we close, to get queued data transmitted.
 		 */
-		(void)TCP_linger(sp->fd, 0);
+		// XXX: not yet (void)TCP_linger(sp->fd, 0);
 		vca_close_session(sp, sp->doclose);
 	}
 

Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -100,11 +100,11 @@
 
 	memset(fds, 0, sizeof fds);
 
-	(void)TCP_linger(vc->fd, 0);
+	// XXX: not yet (void)TCP_linger(vc->fd, 0);
 	fds[0].fd = vc->fd;
 	fds[0].events = POLLIN | POLLERR;
 
-	(void)TCP_linger(sp->fd, 0);
+	// XXX: not yet (void)TCP_linger(sp->fd, 0);
 	fds[1].fd = sp->fd;
 	fds[1].events = POLLIN | POLLERR;
 

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -197,7 +197,7 @@
 			if (sp->t_open > deadline)
 				break;
 			VTAILQ_REMOVE(&sesshead, sp, list);
-			TCP_linger(sp->fd, 0);
+			// XXX: not yet TCP_linger(sp->fd, 0);
 			vca_close_session(sp, "timeout");
 			SES_Delete(sp);
 		}

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -198,7 +198,7 @@
 			if (sp->t_open > deadline)
 				break;
 			VTAILQ_REMOVE(&sesshead, sp, list);
-			(void)TCP_linger(sp->fd, 0);
+			// XXX: not yet (void)TCP_linger(sp->fd, 0);
 			vca_close_session(sp, "timeout");
 			SES_Delete(sp);
 		}

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -166,7 +166,7 @@
 			} else if (sp->t_open <= deadline) {
 				VTAILQ_REMOVE(&sesshead, sp, list);
 				vca_unpoll(fd);
-				(void)TCP_linger(sp->fd, 0);
+				// XXX: not yet (void)TCP_linger(sp->fd, 0);
 				vca_close_session(sp, "timeout");
 				SES_Delete(sp);
 			}

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_ports.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_ports.c	2010-03-08 15:26:15 UTC (rev 4604)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_ports.c	2010-03-09 11:27:08 UTC (rev 4605)
@@ -139,7 +139,7 @@
 			VTAILQ_REMOVE(&sesshead, sp, list);
 			if(sp->fd != -1)
 				vca_del(sp->fd);
-			TCP_linger(sp->fd, 0);
+			// XXX: not yet TCP_linger(sp->fd, 0);
 			vca_close_session(sp, "timeout");
 			SES_Delete(sp);
 		}