Don't hose TIMER kevent with READ kevent

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@860 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index 625e41b3af871fec7669b26bac47befe3a16cb61..e2a40c1f47eef675c668f186be0efd2e0e1e0c7a 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -398,7 +398,6 @@ vca_kq_sess(struct sess *sp, int arm)
 
        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 @@ vca_kq_sess(struct sess *sp, int arm)
                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);