Merged revisions 2232 via svnmerge from

svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2232 | des | 2007-11-08 21:30:06 +0100 (Thu, 08 Nov 2007) | 4 lines
  
  Minimal intervention fix for #162: we can delay arming a kevent, but we
  can't delay disarming it, or we will have a race between the acceptor and
  a worker thread.  This will need revisiting at some later date.
........


git-svn-id: http://www.varnish-cache.org/svn/branches/1.1@2241 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_acceptor_kqueue.c

@@ -66,8 +66,8 @@ vca_kq_sess(struct sess *sp, short arm)
 	if (sp->fd < 0)
 		return;
 	EV_SET(&ki[nki], sp->fd, EVFILT_READ, arm, 0, 0, sp);
-	if (++nki == NKEV) {
-		assert(kevent(kq, ki, nki, NULL, 0, NULL) <= 0);
+	if (++nki == NKEV || arm == EV_DELETE) {
+		AZ(kevent(kq, ki, nki, NULL, 0, NULL));
 		nki = 0;
 	}
 }