<p dir="ltr">\o/</p>
<div class="gmail_quote">On 11 Feb 2015 12:29, "Lasse Karstensen" <<a href="mailto:lkarsten@varnish-software.com">lkarsten@varnish-software.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
commit 412d148583f07da73d34e298f84fa6d36df0b94b<br>
Author: Nils Goroll <<a href="mailto:nils.goroll@uplex.de">nils.goroll@uplex.de</a>><br>
Date:   Wed Feb 4 16:51:30 2015 +0100<br>
<br>
    Expire superseded objects also if they are no IMS/INM candidates<br>
<br>
    Conflicts:<br>
        bin/varnishd/cache/cache_fetch.c<br>
<br>
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c<br>
index f87c1bd..0370bab 100644<br>
--- a/bin/varnishd/cache/cache_fetch.c<br>
+++ b/bin/varnishd/cache/cache_fetch.c<br>
@@ -939,12 +939,9 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,<br>
<br>
        AZ(bo->ims_obj);<br>
        if (oldobj != NULL) {<br>
-               if (http_GetHdr(oldobj->http, H_Last_Modified, NULL) ||<br>
-                  http_GetHdr(oldobj->http, H_ETag, NULL)) {<br>
-                       assert(oldobj->objcore->refcnt > 0);<br>
-                       HSH_Ref(oldobj->objcore);<br>
-                       bo->ims_obj = oldobj;<br>
-               }<br>
+               assert(oldobj->objcore->refcnt > 0);<br>
+               HSH_Ref(oldobj->objcore);<br>
+               bo->ims_obj = oldobj;<br>
        }<br>
<br>
        AZ(bo->req);<br>
diff --git a/bin/varnishtest/tests/c00058.vtc b/bin/varnishtest/tests/c00058.vtc<br>
index 440bbf3..8c9940b 100644<br>
--- a/bin/varnishtest/tests/c00058.vtc<br>
+++ b/bin/varnishtest/tests/c00058.vtc<br>
@@ -22,7 +22,11 @@ client c1 {<br>
        expect resp.bodylen == 3<br>
<br>
        delay 1<br>
+} -run<br>
+<br>
+varnish v1 -expect n_object == 1<br>
<br>
+client c1 {<br>
        # We still get old object<br>
        txreq<br>
        rxresp<br>
@@ -37,3 +41,6 @@ client c1 {<br>
        rxresp<br>
        expect resp.bodylen == 6<br>
 } -run<br>
+<br>
+# and the old one has got superseded<br>
+varnish v1 -expect n_object == 1<br>
<br>
_______________________________________________<br>
varnish-commit mailing list<br>
<a href="mailto:varnish-commit@varnish-cache.org">varnish-commit@varnish-cache.org</a><br>
<a href="https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit" target="_blank">https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit</a><br>
</blockquote></div>