---------------------
PatchSet 485 
Date: 2002/12/25 00:30:32
Author: rbcollins
Branch: esi
Tag: (none) 
Log:
more tweaks

Members: 
	configure.in:1.4.2.2->1.4.2.3 
	src/ESI.cc:1.1.2.86->1.1.2.87 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- squid3/configure.in	19 Dec 2002 11:25:47 -0000	1.4.2.2
+++ squid3/configure.in	25 Dec 2002 00:30:32 -0000	1.4.2.3
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.4.2.2 2002/12/19 11:25:47 rbcollins Exp $
+dnl  $Id: configure.in,v 1.4.2.3 2002/12/25 00:30:32 rbcollins Exp $
 dnl
 dnl
 dnl
@@ -11,9 +11,9 @@
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
+AM_INIT_AUTOMAKE(squid, 3.0-DEVEL-ESI)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.4.2.2 $)dnl
+AC_REVISION($Revision: 1.4.2.3 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
Index: squid3/src/ESI.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESI.cc,v
retrieving revision 1.1.2.86
retrieving revision 1.1.2.87
diff -u -r1.1.2.86 -r1.1.2.87
--- squid3/src/ESI.cc	24 Dec 2002 21:32:48 -0000	1.1.2.86
+++ squid3/src/ESI.cc	25 Dec 2002 00:30:33 -0000	1.1.2.87
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.1.2.86 2002/12/24 21:32:48 rbcollins Exp $
+ * $Id: ESI.cc,v 1.1.2.87 2002/12/25 00:30:33 rbcollins Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -319,6 +319,7 @@
     bool started;
     bool sent;
     esiInclude(esiInclude const &);
+    bool dataNeeded() const;
 };
 MemPool *esiInclude::Pool = NULL;
 
@@ -2450,13 +2451,19 @@
     subRequestDone (stream, false);
 }
 
+bool
+esiInclude::dataNeeded() const
+{
+    return !(flags.finished || flags.failed);
+}
+
 void
 esiInclude::subRequestDone (esiStreamContext *stream, bool success)
 {
     assert (this);
-    if (flags.finished || flags.failed)
-	/* Do nothing, we don't need the data */
+    if (!dataNeeded())
 	return;
+
     if (stream == src) {
 	if (success) {
 	    /* copy the lead segment */