r860 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-21 11:49:43 +0200 (Mon, 21 Aug 2006)
New Revision: 860

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
Log:
Don't hose TIMER kevent with READ kevent


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-21 09:49:02 UTC (rev 859)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-21 09:49:43 UTC (rev 860)
@@ -398,7 +398,6 @@
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	memset(ke, 0, sizeof ke);
-	j = 0;
 	if (arm == EV_ADD || arm == EV_ENABLE) {
 		assert(sp->kqa == 0);
 		sp->kqa = 1;
@@ -408,9 +407,9 @@
 		sp->kqa = 0;
 		arm2 = EV_DELETE;
 	}
+	j = 0;
 	EV_SET(&ke[j++], sp->id, EVFILT_TIMER, arm2,
 	    0, params->sess_timeout * 1000, sp);
-	j = 0;
 	if (sp->fd >= 0)
 		EV_SET(&ke[j++], sp->fd, EVFILT_READ, arm, 0, 0, sp);