---------------------
PatchSet 4934 
Date: 2002/09/09 12:47:05
Author: rbcollins
Branch: esi
Tag: (none) 
Log:
finish fix

Members: 
	src/client_side_reply.c:1.1.2.21->1.1.2.22 

Index: squid/src/client_side_reply.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/client_side_reply.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- squid/src/client_side_reply.c	9 Sep 2002 12:36:13 -0000	1.1.2.21
+++ squid/src/client_side_reply.c	9 Sep 2002 12:47:05 -0000	1.1.2.22
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.c,v 1.1.2.21 2002/09/09 12:36:13 rbcollins Exp $
+ * $Id: client_side_reply.c,v 1.1.2.22 2002/09/09 12:47:05 rbcollins Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -365,6 +365,7 @@
         /* We initiated the IMS request, the client is not expecting
          * 304, so put the good one back.  First, make sure the old entry
          * headers have been loaded from disk. */
+	clientStreamNode *next = context->http->client_stream.head->next->data;
         oldentry = http->old_entry;
         http->log_type = LOG_TCP_REFRESH_HIT;
         if (oldentry->mem_obj->request == NULL) {
@@ -390,7 +391,6 @@
 	assert(!EBIT_TEST(entry->flags, ENTRY_ABORTED));
 	clientSendMoreData(context, next->readbuf, context->reqsize);
     } else {
-	clientStreamNode *next;
         /* the client can handle this reply, whatever it is */
         http->log_type = LOG_TCP_REFRESH_MISS;
         if (HTTP_NOT_MODIFIED == mem->reply->sline.status) {
@@ -404,7 +404,6 @@
 	context->old_reqofs = 0;
 	context->old_reqsize = 0;
 	assert(!EBIT_TEST(entry->flags, ENTRY_ABORTED));
-	next = context->http->client_stream.head->next->data;
 	/* TODO: provide SendMoreData with the ready parsed reply */
 	clientSendMoreData(context, context->tempbuf, context->reqsize);
     }