---------------------
PatchSet 11182 
Date: 2007/01/24 01:40:28
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Bug #1878: If-Modified-Since broken in 2.6.STABLE8

A copy-paste error in the patch for bug #1783 accidently broke
If-Modified-Since (got negated, acting like If-Unmodified-Since)

Members: 
	src/client_side.c:1.694->1.695 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- squid/src/client_side.c	21 Jan 2007 12:53:58 -0000	1.694
+++ squid/src/client_side.c	24 Jan 2007 01:40:28 -0000	1.695
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.694 2007/01/21 12:53:58 adrian Exp $
+ * $Id: client_side.c,v 1.695 2007/01/24 01:40:28 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2217,11 +2217,11 @@
 	    stringClean(&req_etags);
 	    if (has_etag) {
 		debug(33, 4) ("clientCacheHit: If-None-Match matches\n");
-		is_modified = 0;
+		if (is_modified == -1)
+		    is_modified = 0;
 	    } else {
 		debug(33, 4) ("clientCacheHit: If-None-Match mismatch\n");
-		if (is_modified == -1)
-		    is_modified = 1;
+		is_modified = 1;
 	    }
 	}
     }
@@ -2237,12 +2237,12 @@
 	    return;
 	}
 	if (modifiedSince(e, http->request)) {
-	    debug(33, 4) ("clientCacheHit: If-Modified-Since not modified\n");
-	    is_modified = 0;
-	} else {
 	    debug(33, 4) ("clientCacheHit: If-Modified-Since modified\n");
+	    is_modified = 1;
+	} else {
+	    debug(33, 4) ("clientCacheHit: If-Modified-Since not modified\n");
 	    if (is_modified == -1)
-		is_modified = 1;
+		is_modified = 0;
 	}
     }
     stale = refreshCheckHTTPStale(e, r);