---------------------
PatchSet 8941 
Date: 2007/02/23 12:10:13
Author: adri
Branch: storework
Tag: (none) 
Log:
Prevent objects from being kept in-memory cache.

Members: 
	src/client_side.c:1.168.2.8->1.168.2.9 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.168.2.8
retrieving revision 1.168.2.9
diff -u -r1.168.2.8 -r1.168.2.9
--- squid/src/client_side.c	23 Feb 2007 08:09:05 -0000	1.168.2.8
+++ squid/src/client_side.c	23 Feb 2007 12:10:13 -0000	1.168.2.9
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.168.2.8 2007/02/23 08:09:05 adri Exp $
+ * $Id: client_side.c,v 1.168.2.9 2007/02/23 12:10:13 adri Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2652,12 +2652,17 @@
 	return;
     }
     http->entry = clientCreateStoreEntry(http, r->method, r->flags);
+    storeExpireNow(http->entry);
+    storeReleaseRequest(http->entry);
+    /* We're not caching content at the moment! */
+#if 0
     if (Config.onoff.collapsed_forwarding && r->flags.cachable && !r->flags.need_validation && (r->method = METHOD_GET || r->method == METHOD_HEAD)) {
 	http->entry->mem_obj->refresh_timestamp = squid_curtime;
 	http->entry->mem_obj->request = requestLink(r);
 	EBIT_SET(http->entry->flags, KEY_EARLY_PUBLIC);
 	storeSetPublicKey(http->entry);
     }
+#endif
     fwdStart(http->conn->fd, http->entry, r);
 }