r5647 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-12-17 14:45:04 +0100 (Fri, 17 Dec 2010)
New Revision: 5647

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
Remove an old workaround for VCL calls from LRU processing.



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2010-12-15 16:28:52 UTC (rev 5646)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2010-12-17 13:45:04 UTC (rev 5647)
@@ -436,7 +436,7 @@
 	int i;
 	struct http *hp, *hp2;
 	char *b;
-	unsigned handling, l, nhttp;
+	unsigned l, nhttp;
 	int varyl = 0;
 	struct vsb *vary = NULL;
 
@@ -526,13 +526,6 @@
 
 	VCL_fetch_method(sp);
 
-	/*
-	 * When we fetch the body, we may hit the LRU cleanup and that
-	 * will overwrite sp->handling, so we have to save our plans
-	 * here.
-	 */
-	handling = sp->handling;
-
 	if (sp->objcore == NULL) {
 		/* This is a pass from vcl_recv */
 		sp->wrk->cacheable = 0;
@@ -629,7 +622,7 @@
 	if (sp->wrk->do_esi)
 		ESI_Parse(sp);
 
-	switch (handling) {
+	switch (sp->handling) {
 	case VCL_RET_RESTART:
 		HSH_Drop(sp);
 		sp->director = NULL;