r933 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-09-06 23:52:50 +0200 (Wed, 06 Sep 2006)
New Revision: 933

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Move some setup code to first state now that we have it.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2006-09-06 21:41:13 UTC (rev 932)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2006-09-06 21:52:50 UTC (rev 933)
@@ -240,6 +240,8 @@
 	int i;
 
 	VCA_Prep(sp);
+	sp->wrk->acct.sess++;
+	SES_RefSrcAddr(sp);
 	for (;;) {
 		i = http_RecvSome(sp->fd, sp->http);
 		switch (i) {

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-09-06 21:41:13 UTC (rev 932)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-09-06 21:52:50 UTC (rev 933)
@@ -138,10 +138,6 @@
 	CHECK_OBJ_NOTNULL(wrq->sess, SESS_MAGIC);
 	wrq->sess->wrk = w;
 	w->wrq = wrq;
-	if (wrq->sess->srcaddr == NULL) {
-		w->acct.sess++;
-		SES_RefSrcAddr(wrq->sess);
-	}
 	if (w->nobj != NULL)
 		CHECK_OBJ(w->nobj, OBJECT_MAGIC);
 	if (w->nobjhead != NULL)