r2186 - in trunk/varnish-cache: bin/varnishd lib/libvcl

[phk at projects.linpro.no]

Author: phk
Date: 2007-10-29 11:22:22 +0100 (Mon, 29 Oct 2007)
New Revision: 2186

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
   trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Make bereq. available from vcl_fetch()


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-29 10:20:36 UTC (rev 2185)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-29 10:22:22 UTC (rev 2186)
@@ -284,7 +284,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 [

Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl	2007-10-29 10:20:36 UTC (rev 2185)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl	2007-10-29 10:22:22 UTC (rev 2186)
@@ -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: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c	2007-10-29 10:20:36 UTC (rev 2185)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c	2007-10-29 10:22:22 UTC (rev 2186)
@@ -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)",