move object twiddling from FetchHdr() to cache_center.c

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3835 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_center.c

@@ -385,7 +385,11 @@ cnt_fetch(struct sess *sp)
 	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);

bin/varnishd/cache_fetch.c

@@ -333,10 +333,6 @@ FetchHdr(struct sess *sp)
 	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 @@ FetchHdr(struct sess *sp)
 		/* XXX: other cleanup ? */
 		return (__LINE__);
 	}
-
 	return (0);
-
 }
 
 /*--------------------------------------------------------------------*/