[experimental-ims] bccc1f7 Merged conditional backend request feature

[Geoff Simmons]

commit bccc1f7566fa05e41a758a68b07b890872d66591
Author: Geoff Simmons <geoff at uplex.de>
Date:   Thu Jun 2 21:47:07 2011 +0200

    Merged conditional backend request feature

diff --git a/bin/varnishd/cache_http.c b/bin/varnishd/cache_http.c
index 1279b60..f042321 100644
--- a/bin/varnishd/cache_http.c
+++ b/bin/varnishd/cache_http.c
@@ -70,6 +70,10 @@ void http_FilterMissingFields(struct worker *w, int fd, struct http *to,
     const struct http *fm);
 
 static enum VSL_tag_e
+
+void http_FilterMissingFields(struct worker *w, int fd, struct http *to,
+    const struct http *fm);
+
 http2shmlog(const struct http *hp, int t)
 {
 
diff --git a/bin/varnishd/cache_vrt_var.c b/bin/varnishd/cache_vrt_var.c
index 92013be..c27e28f 100644
--- a/bin/varnishd/cache_vrt_var.c
+++ b/bin/varnishd/cache_vrt_var.c
@@ -479,6 +479,7 @@ VRT_DO_EXP(req, sp, keep, 0, )
 VRT_DO_EXP(obj, sp->obj, grace, 0, EXP_Rearm(sp->obj))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Merged conditional backend request feature
 VRT_DO_EXP(obj, sp->obj, ttl, 0, EXP_Rearm(sp->obj))
@@ -497,6 +498,15 @@ VRT_DO_EXP(beresp, sp->wrk, ttl, 0,
 >>>>>>> Merged conditional backend request feature
 =======
 >>>>>>> Merged conditional backend request feature
+=======
+RT_DO_EXP(obj, sp->obj, ttl, 0,
+	   EXP_Rearm(sp->obj);
+	   WSP(sp, SLT_TTL, "%u VCL %.0f %.0f", sp->obj->xid, a, sp->t_req))
+VRT_DO_EXP(obj, sp->obj, keep, 0, EXP_Rearm(sp->obj))
+VRT_DO_EXP(beresp, sp->wrk, grace, 0, )
+VRT_DO_EXP(beresp, sp->wrk, ttl, 0,
+	   WSP(sp, SLT_TTL, "%u VCL %.0f %.0f", sp->xid, a, sp->t_req))
+>>>>>>> Merged conditional backend request feature
 VRT_DO_EXP(beresp, sp->wrk, keep, 0, )
 VRT_DO_EXP_r(stale_obj, sp->stale_obj, grace, 1)
 VRT_DO_EXP_r(stale_obj, sp->stale_obj, ttl, 1)