r2216 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 15:07:40 +0100 (Tue, 30 Oct 2007)
New Revision: 2216

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_center.c
Log:
Merged revisions 2208,2210,2214 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2208 | des | 2007-10-30 13:38:34 +0100 (Tue, 30 Oct 2007) | 2 lines
  
  AFAICT, it is perfectly valid for sp->vcl to be NULL here.
........
  r2210 | des | 2007-10-30 13:57:03 +0100 (Tue, 30 Oct 2007) | 2 lines
  
  Revert r2208, I believe the assert is correct.
........
  r2214 | des | 2007-10-30 15:02:58 +0100 (Tue, 30 Oct 2007) | 5 lines
  
  r2208 was correct but incomplete.  It is possible for a session to reach
  cnt_done() without a VCL reference, if we never got a request on that
  connection.  However, a session that reaches cnt_again() will never have
  a VCL reference, so the assertion there is incorrect.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2208,2210,2214

Modified: branches/1.2/bin/varnishd/cache_center.c
===================================================================
--- branches/1.2/bin/varnishd/cache_center.c	2007-10-30 14:06:37 UTC (rev 2215)
+++ branches/1.2/bin/varnishd/cache_center.c	2007-10-30 14:07:40 UTC (rev 2216)
@@ -88,7 +88,7 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	AZ(sp->vcl);
 	AZ(sp->obj);
 	assert(sp->xid == 0);
 
@@ -191,7 +191,7 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_ORNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	AZ(sp->obj);
 	AZ(sp->bereq);