r3835 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-02-27 13:10:01 +0100 (Fri, 27 Feb 2009)
New Revision: 3835

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
Log:
move object twiddling from FetchHdr() to cache_center.c



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-02-27 12:02:50 UTC (rev 3834)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-02-27 12:10:01 UTC (rev 3835)
@@ -385,7 +385,11 @@
 	AN(sp->bereq);
 	AN(sp->director);
 	AZ(sp->vbe);
+
+	sp->obj->xid = sp->xid;
+	WS_Assert(sp->obj->ws_o);
 	i = FetchHdr(sp);
+	
 	if (i == 0)
 		i = FetchBody(sp);
 	AZ(sp->wrk->wfd);

Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-27 12:02:50 UTC (rev 3834)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-27 12:10:01 UTC (rev 3835)
@@ -333,10 +333,6 @@
 	bereq = sp->bereq;
 	hp = &bereq->http[0];
 
-	sp->obj->xid = sp->xid;
-
-	/* Set up obj's workspace */
-	WS_Assert(sp->obj->ws_o);
 	VBE_GetFd(sp);
 	if (sp->vbe == NULL)
 		return (__LINE__);
@@ -393,9 +389,7 @@
 		/* XXX: other cleanup ? */
 		return (__LINE__);
 	}
-
 	return (0);
-
 }
 
 /*--------------------------------------------------------------------*/