---------------------
PatchSet 4881 
Date: 2002/09/05 22:01:49
Author: rbcollins
Branch: rfc2616
Tag: (none) 
Log:
pre-merge

Members: 
	SPONSORS:1.6->1.6.34.1 
	doc/debug-sections.txt:1.5->1.5.6.1 
	src/store.c:1.17.2.1->1.17.2.2 

Index: squid/SPONSORS
===================================================================
RCS file: /cvsroot/squid-sf//squid/SPONSORS,v
retrieving revision 1.6
retrieving revision 1.6.34.1
diff -u -r1.6 -r1.6.34.1
--- squid/SPONSORS	21 Dec 2001 15:14:55 -0000	1.6
+++ squid/SPONSORS	5 Sep 2002 22:01:49 -0000	1.6.34.1
@@ -33,3 +33,10 @@
 
 	SGI has provided hardware donations for Squid developers.
 
+Zope Corporation - http://www.zope.com/
+
+	Zope Corporation funded the development of the ESI protocol
+	(http://www.esi.org) in Squid to provide greater cachability
+	of dynamic and personalized pages by caching common page
+	components. Zope engaged one of the core Squid developers
+	for the project.
Index: squid/doc/debug-sections.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/debug-sections.txt,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -r1.5 -r1.5.6.1
--- squid/doc/debug-sections.txt	21 Jul 2002 21:48:03 -0000	1.5
+++ squid/doc/debug-sections.txt	5 Sep 2002 22:01:50 -0000	1.5.6.1
@@ -88,3 +88,6 @@
 section 82    External ACL
 section 83    SSL accelerator support
 section 84    Helper process maintenance
+section 85    Client side request management - after parsing, before caching
+section 87    client side stream management
+section 88    Client side reply management - from store to stream
Index: squid/src/store.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store.c,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -r1.17.2.1 -r1.17.2.2
--- squid/src/store.c	5 Sep 2002 10:28:22 -0000	1.17.2.1
+++ squid/src/store.c	5 Sep 2002 22:01:51 -0000	1.17.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.c,v 1.17.2.1 2002/09/05 10:28:22 rbcollins Exp $
+ * $Id: store.c,v 1.17.2.2 2002/09/05 22:01:51 rbcollins Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -1331,6 +1331,7 @@
     /* TODO: mark the length of the headers ? */
     /* We ONLY want the headers */
     packerToStoreInit(&p, e);
+    assert (e->mem_obj->inmem_hi == 0);
     httpReplyPackHeadersInto(mem->reply, &p);
     myrep->hdr_sz = e->mem_obj->inmem_hi;  /* yuk */
     httpBodyPackInto(&mem->reply->body, &p);