r3669 - branches/2.0/varnish-cache/lib/libvcl

tfheen at projects.linpro.no tfheen at projects.linpro.no
Fri Feb 6 14:37:42 CET 2009


Author: tfheen
Date: 2009-02-06 14:37:42 +0100 (Fri, 06 Feb 2009)
New Revision: 3669

Modified:
   branches/2.0/varnish-cache/lib/libvcl/vcc_action.c
Log:
Merge r3476: This is a bandaid for a pointer dereference when "restart" is used.



Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_action.c	2009-02-06 13:28:01 UTC (rev 3668)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_action.c	2009-02-06 13:37:42 UTC (rev 3669)
@@ -85,7 +85,8 @@
 		ERRCHK(tl);
 	}
 	Fb(tl, 1, "VRT_done(sp, VCL_RET_RESTART);\n");
-	vcc_ProcAction(tl->curproc, VCL_RET_RESTART, tl->t);
+	assert(VCL_RET_RESTART == (1 << 9));	/* XXX: BANDAID FIXME! */
+	vcc_ProcAction(tl->curproc, 9, tl->t);
 	vcc_NextToken(tl);
 }
 



More information about the varnish-commit mailing list