---------------------
PatchSet 4931 
Date: 2002/09/09 12:36:09
Author: rbcollins
Branch: rfc2616
Tag: (none) 
Log:
304 minor bugfix

Members: 
	src/client_side_reply.c:1.1.4.3->1.1.4.4 

Index: squid/src/client_side_reply.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/client_side_reply.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -r1.1.4.3 -r1.1.4.4
--- squid/src/client_side_reply.c	8 Sep 2002 10:48:10 -0000	1.1.4.3
+++ squid/src/client_side_reply.c	9 Sep 2002 12:36:09 -0000	1.1.4.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.c,v 1.1.4.3 2002/09/08 10:48:10 rbcollins Exp $
+ * $Id: client_side_reply.c,v 1.1.4.4 2002/09/09 12:36:09 rbcollins Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -379,6 +379,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) {
@@ -402,10 +403,9 @@
 	entry = http->entry;
 	/* here the data to send is in the next nodes buffers already */
 	assert(!EBIT_TEST(entry->flags, ENTRY_ABORTED));
-	clientSendMoreData(context, context->tempbuf, context->reqsize);
+	clientSendMoreData(context, next->readbuf, context->reqsize);
     } else {
 	if (httpReplyValidatorsMatch (entry->mem_obj->reply, http->old_entry->mem_obj->reply)) {
-	    clientStreamNode *next;
 	    /* the client needs to get this reply */
 	    http->log_type = LOG_TCP_REFRESH_MISS;
 	    if (HTTP_NOT_MODIFIED == mem->reply->sline.status) {
@@ -419,9 +419,8 @@
 	    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, next->readbuf, context->reqsize);
+	    clientSendMoreData(context, context->tempbuf, context->reqsize);
 	} else {
 	    /* TODO: invalidate the old entry, and start over */
 	    assert (0);