From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 24 Sep 2009 09:24:45 +0000 (+1200)
Subject: Author: Philippe Lantin <plantin@cobaltgroup.com>
X-Git-Tag: SQUID_3_0_STABLE20~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92541bb7300fce061933d7cc2f7cb2d03922396c;p=thirdparty%2Fsquid.git

Author: Philippe Lantin <plantin@cobaltgroup.com>
Bug 2624: Invalid response for IMS request

Squid forgot to verify the client provided If-Modified-Since when
seeing a 304 from upstream.
---

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 541abc7ed2..f10ee15757 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -366,7 +366,7 @@ clientReplyContext::handleIMSReply(StoreIOBuffer result)
 
 	// if client sent IMS
 
-	if (http->request->flags.ims) {
+        if (http->request->flags.ims && !old_entry->modifiedSince(http->request)) {
 	    // forward the 304 from origin
 	    debugs(88, 3, "handleIMSReply: origin replied 304, revalidating existing entry and forwarding 304 to client");
 	    sendClientUpstreamResponse();