r2082 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-10-08 09:50:31 +0200 (Mon, 08 Oct 2007)
New Revision: 2082

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
Log:
Use HTC_Rx() directly instead of vca_pollsession() wrapper


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2007-10-08 07:49:26 UTC (rev 2081)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2007-10-08 07:50:31 UTC (rev 2082)
@@ -98,14 +98,15 @@
 	}
 	CAST_OBJ_NOTNULL(sp, kp->udata, SESS_MAGIC);
 	if (kp->data > 0) {
-		i = vca_pollsession(sp);
-		if (i == -1)
-			return;
+		i = HTC_Rx(sp->htc);
+		if (i == 0)
+			return;	/* more needed */
 		VTAILQ_REMOVE(&sesshead, sp, list);
-		if (i == 0) {
+		if (i > 0) {
 			vca_kq_sess(sp, EV_DELETE);
 			vca_handover(sp, i);
 		} else {
+			vca_close_session(sp, "err/poll");
 			SES_Delete(sp);
 		}
 		return;