From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 18 Sep 2009 20:40:02 +0000 (+0200)
Subject: Author:  Philippe Lantin <plantin@cobaltgroup.com>
X-Git-Tag: SQUID_3_2_0_1~710
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee15ba9b6337ed7a63b472a731048a550967e73c;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 383d9b9a10..e9a1d0cad9 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -368,7 +368,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();