---------------------
PatchSet 4099 
Date: 2002/04/30 21:56:41
Author: hno
Branch: etag
Tag: (none) 
Log:
Fixup dealing with aborted connections

Members: 
	src/client_side.c:1.29.2.22->1.29.2.23 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.29.2.22
retrieving revision 1.29.2.23
diff -u -r1.29.2.22 -r1.29.2.23
--- squid/src/client_side.c	1 Apr 2002 23:36:41 -0000	1.29.2.22
+++ squid/src/client_side.c	30 Apr 2002 21:56:41 -0000	1.29.2.23
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.29.2.22 2002/04/01 23:36:41 hno Exp $
+ * $Id: client_side.c,v 1.29.2.23 2002/04/30 21:56:41 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -405,12 +405,14 @@
     http_status status;
     debug(33, 3) ("clientHandleETagReply: %s, %d bytes\n", url, (int) size);
     if (entry == NULL) {
+	/* client aborted */
 	memFree(buf, MEM_CLIENT_SOCK_BUF);
-	clientHandleETagMiss(http);
+	return;
     }
     if (size < 0 && !EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 	memFree(buf, MEM_CLIENT_SOCK_BUF);
 	clientHandleETagMiss(http);
+	return;
     }
     mem = entry->mem_obj;
     status = mem->reply->sline.status;
@@ -442,10 +444,11 @@
 	/* Remember the ETag and restart */
 	memFree(buf, MEM_CLIENT_SOCK_BUF);
 	clientHandleETagMiss(http);
-    } else {
-	/* Send the new object to the client */
-	clientSendMoreData(data, buf, size);
+	return;
     }
+    /* Send the new object to the client */
+    clientSendMoreData(data, buf, size);
+    return;
 }
 
 static void