Make bereq. available from vcl_fetch()

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2186 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index c8a28ef62e4c6fc52276dda68331fff0ae668a55..214d3e4e49cc4cb080d16c37fe69fad202bd3096 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -284,7 +284,7 @@ DOT         label="fetch from backend\n(find obj.ttl)"
 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 [

diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index c50a11ff23f0e9df6ce82220f6c680720ee58fb0..669d478fc8238683612fd1f416a5dbab0fa3ccf7 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -101,22 +101,22 @@ set spobj {
        # 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 *"
        }
 

diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c
index 7c01cb50229fa1d69aadbdc2a04cf1e19650b1d4..6ea90a03bb16db31703af4e81cd77b828243f15d 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_obj.c
+++ b/varnish-cache/lib/libvcl/vcc_obj.c
@@ -110,28 +110,28 @@ struct var vcc_vars[] = {
            "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)",