[master] c0613e9 Try to make this compile again

Poul-Henning Kamp phk at FreeBSD.org
Mon Jan 12 11:47:01 CET 2015


commit c0613e99bce03c31796ade9d8fa4e62428a1fe11
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 12 10:46:50 2015 +0000

    Try to make this compile again

diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 79cddaa..eb1581b 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -87,7 +87,7 @@ vws_port_ev(struct vws *vws, port_event_t *ev, double now) {
 		if(ev->portev_events & POLLERR) {
 			vws_del(vws, sp->fd);
 			VTAILQ_REMOVE(&vws->sesshead, sp, list);
-			vws->func(sp, sp->fd, WAITER_REMCLOSE);
+			vws->func(sp, sp->fd, WAITER_REMCLOSE, now);
 			return;
 		}
 
@@ -108,7 +108,7 @@ vws_port_ev(struct vws *vws, port_event_t *ev, double now) {
 		VTAILQ_REMOVE(&vws->sesshead, sp, list);
 
 		/* also handle errors */
-		vws->func(sp, sp->fd, WAITER_ACTION);
+		vws->func(sp, sp->fd, WAITER_ACTION, now);
 	}
 	return;
 }
@@ -212,7 +212,7 @@ vws_thread(void *priv)
 			if(sp->fd != -1) {
 				vws_del(vws, sp->fd);
 			}
-			vws->func(sp, sp->fd, WAITER_TIMEOUT);
+			vws->func(sp, sp->fd, WAITER_TIMEOUT, now);
 		}
 
 		/*



More information about the varnish-commit mailing list