From bf6ece35088c4f28af902f72ab1d3edcf4015034 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 4 Jul 2017 12:48:36 +0000 Subject: [PATCH] consistently use the evtimer wrappers around the connection timeout. this is instead of setting the timeout up with event_set and event_add, but removing it with evtimer_del. this uses evtimer_set and evtimer_add. prompted by dlg's commit to identd OK dlg --- usr.sbin/slowcgi/slowcgi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/slowcgi/slowcgi.c b/usr.sbin/slowcgi/slowcgi.c index b8629d202cd..a9a90b2db1f 100644 --- a/usr.sbin/slowcgi/slowcgi.c +++ b/usr.sbin/slowcgi/slowcgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slowcgi.c,v 1.51 2017/05/26 17:38:46 florian Exp $ */ +/* $OpenBSD: slowcgi.c,v 1.52 2017/07/04 12:48:36 florian Exp $ */ /* * Copyright (c) 2013 David Gwynne * Copyright (c) 2013 Florian Obser @@ -506,8 +506,8 @@ slowcgi_accept(int fd, short events, void *arg) event_set(&c->ev, s, EV_READ | EV_PERSIST, slowcgi_request, c); event_add(&c->ev, NULL); event_set(&c->resp_ev, s, EV_WRITE | EV_PERSIST, slowcgi_response, c); - event_set(&c->tmo, s, 0, slowcgi_timeout, c); - event_add(&c->tmo, &timeout); + evtimer_set(&c->tmo, slowcgi_timeout, c); + evtimer_add(&c->tmo, &timeout); requests->request = c; SLIST_INSERT_HEAD(&slowcgi_proc.requests, requests, entry); } -- 2.20.1