[master] 73d989b Patch from Geoff:

Poul-Henning Kamp phk at varnish-cache.org
Mon Jul 30 11:17:22 CEST 2012


commit 73d989b5ccf1056399c3fe3e05ccf036f175c5f6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jul 30 09:15:06 2012 +0000

    Patch from Geoff:
    
    Fixes a compile error (incorrect signature for SES_Delete() in
    cache_waiter_ports.c)

diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 87eaeac..af5d965 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -80,14 +80,13 @@ vws_port_ev(struct vws *vws, port_event_t *ev, double now) {
 		VTAILQ_INSERT_TAIL(&vws->sesshead, sp, list);
 		vws_add(vws, sp->fd, sp);
 	} else {
-		int i;
 		assert(ev->portev_source == PORT_SOURCE_FD);
 		CAST_OBJ_NOTNULL(sp, ev->portev_user, SESS_MAGIC);
 		assert(sp->fd >= 0);
 		if(ev->portev_events & POLLERR) {
 			vws_del(vws, sp->fd);
 			VTAILQ_REMOVE(&vws->sesshead, sp, list);
-			SES_Delete(sp, "EOF", now);
+			SES_Delete(sp, SC_REM_CLOSE, now);
 			return;
 		}
 
@@ -211,7 +210,7 @@ vws_thread(void *priv)
 			if(sp->fd != -1) {
 				vws_del(vws, sp->fd);
 			}
-			SES_Delete(sp, "timeout", now);
+			SES_Delete(sp, SC_RX_TIMEOUT, now);
 		}
 
 		/*



More information about the varnish-commit mailing list