From ec928af08fd854e7cdf8f80e99766b1c1e479000 Mon Sep 17 00:00:00 2001
From: Jocelyn De La Rosa <jocelyn.delarosa@smartjog.com>
Date: Wed, 11 Jan 2012 18:09:20 +0100
Subject: [PATCH 2/2] Prevent the use of busy object for backend conditional request

---
 bin/varnishd/cache_hash.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/bin/varnishd/cache_hash.c b/bin/varnishd/cache_hash.c
index ec1e894..1018e3e 100644
--- a/bin/varnishd/cache_hash.c
+++ b/bin/varnishd/cache_hash.c
@@ -418,7 +418,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
                  * - it has a Last-Modified and/or an ETag header.
                  * If there are several, use the least expired one.
                  */
-               if (EXP_Keep(sp, o) >= sp->t_req
+       if ((o->objcore->flags & OC_F_BUSY) == 0 &&
+           EXP_Keep(sp, o) >= sp->t_req
                    && (http_GetHdr(o->http, H_Last_Modified, &p)
                        || http_GetHdr(o->http, H_ETag, &p)))
                    if (stale_o == NULL ||
--
1.7.2.5