r526 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-20 15:42:56 +0200 (Thu, 20 Jul 2006)
New Revision: 526

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Only reference srcaddr on first request on session


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2006-07-20 13:39:47 UTC (rev 525)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2006-07-20 13:42:56 UTC (rev 526)
@@ -516,7 +516,6 @@
 
 	sp->t0 = time(NULL);
 	sp->vcl = VCL_Get();
-	SES_RefSrcAddr(sp);
 
 	assert(sp->obj == NULL);
 

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-07-20 13:39:47 UTC (rev 525)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-07-20 13:42:56 UTC (rev 526)
@@ -37,9 +37,10 @@
 	TAILQ_REMOVE(&wrk_reqhead, wrq, list);
 	VSL_stats->n_wrk_queue--;
 	AZ(pthread_mutex_unlock(&wrk_mtx));
-	assert(wrq->sess != NULL);
+	CHECK_OBJ_NOTNULL(wrq->sess, SESS_MAGIC);
 	wrq->sess->wrk = w;
-	CHECK_OBJ_NOTNULL(wrq->sess, SESS_MAGIC);
+	if (wrq->sess->srcaddr == NULL)
+		SES_RefSrcAddr(wrq->sess);
 	if (w->nobj != NULL)
 		CHECK_OBJ(w->nobj, OBJECT_MAGIC);
 	if (w->nobjhead != NULL)