r2200 - in branches/1.2: . bin/varnishd lib/libvcl

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 12:03:50 +0100 (Tue, 30 Oct 2007)
New Revision: 2200

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_center.c
   branches/1.2/lib/libvcl/vcc_gen_obj.tcl
   branches/1.2/lib/libvcl/vcc_obj.c
Log:
Merged revisions 2184,2186 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2184 | phk | 2007-10-29 11:17:58 +0100 (Mon, 29 Oct 2007) | 2 lines
  
  Postpone freeing the bereq until after VCL_fetch() has been called
........
  r2186 | phk | 2007-10-29 11:22:22 +0100 (Mon, 29 Oct 2007) | 2 lines
  
  Make bereq. available from vcl_fetch()
........



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,2175-2176,2180-2183,2191-2192
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2175-2176,2180-2184,2186,2191-2192

Modified: branches/1.2/bin/varnishd/cache_center.c
===================================================================
--- branches/1.2/bin/varnishd/cache_center.c	2007-10-30 11:03:22 UTC (rev 2199)
+++ branches/1.2/bin/varnishd/cache_center.c	2007-10-30 11:03:50 UTC (rev 2200)
@@ -279,7 +279,7 @@
 DOT	]
 DOT	vcl_fetch [
 DOT		shape=record
-DOT		label="vcl_fetch()|req.\nobj."
+DOT		label="vcl_fetch()|req.\nobj.\nbereq."
 DOT	]
 DOT	fetch -> vcl_fetch [style=bold,color=blue,weight=2]
 DOT	fetch_pass [
@@ -305,9 +305,6 @@
 	i = Fetch(sp);
 	CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
 
-	VBE_free_bereq(sp->bereq);
-	sp->bereq = NULL;
-
 	if (!i)
 		RFC2616_cache_policy(sp, sp->obj->http);	/* XXX -> VCL */
 	else {
@@ -320,6 +317,9 @@
 	sp->err_code = http_GetStatus(sp->obj->http);
 	VCL_fetch_method(sp);
 
+	VBE_free_bereq(sp->bereq);
+	sp->bereq = NULL;
+
 	switch (sp->handling) {
 	case VCL_RET_ERROR:
 	case VCL_RET_RESTART:

Modified: branches/1.2/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2007-10-30 11:03:22 UTC (rev 2199)
+++ branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2007-10-30 11:03:50 UTC (rev 2200)
@@ -101,22 +101,22 @@
 	# Request sent to backend
 	{ bereq.request
 		RW STRING
-		{     pipe pass      miss                                  }
+		{     pipe pass      miss     fetch                        }
 		"const struct sess *"
 	}
 	{ bereq.url
 		RW STRING
-		{     pipe pass      miss                                  }
+		{     pipe pass      miss     fetch                        }
 		"const struct sess *"
 	}
 	{ bereq.proto
 		RW STRING
-		{     pipe pass      miss                                  }
+		{     pipe pass      miss     fetch                        }
 		"const struct sess *"
 	}
 	{ bereq.http.
 		RW HDR_BEREQ
-		{     pipe pass      miss                                  }
+		{     pipe pass      miss     fetch                        }
 		"const struct sess *"
 	}
 

Modified: branches/1.2/lib/libvcl/vcc_obj.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_obj.c	2007-10-30 11:03:22 UTC (rev 2199)
+++ branches/1.2/lib/libvcl/vcc_obj.c	2007-10-30 11:03:50 UTC (rev 2200)
@@ -110,28 +110,28 @@
 	    "VRT_l_bereq_request(sp, ",
 	    V_RW,
 	    0,
-	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS
+	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.url", STRING, 9,
 	    "VRT_r_bereq_url(sp)",
 	    "VRT_l_bereq_url(sp, ",
 	    V_RW,
 	    0,
-	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS
+	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.proto", STRING, 11,
 	    "VRT_r_bereq_proto(sp)",
 	    "VRT_l_bereq_proto(sp, ",
 	    V_RW,
 	    0,
-	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS
+	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.http.", HEADER, 11,
 	    "VRT_r_bereq_http_(sp)",
 	    "VRT_l_bereq_http_(sp, ",
 	    V_RW,
 	    "HDR_BEREQ",
-	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS
+	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "obj.proto", STRING, 9,
 	    "VRT_r_obj_proto(sp)",