---------------------
PatchSet 11719 
Date: 2007/10/08 15:05:47
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Fix some uninitialized locals after the reply processing restructuring

Problem reported by Alexander <lav@netis.ru> on squid-dev.

Members: 
	src/client_side.c:1.742->1.743 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- squid/src/client_side.c	25 Sep 2007 03:50:20 -0000	1.742
+++ squid/src/client_side.c	8 Oct 2007 15:05:47 -0000	1.743
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.742 2007/09/25 03:50:20 hno Exp $
+ * $Id: client_side.c,v 1.743 2007/10/08 15:05:47 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -718,9 +718,7 @@
 {
     clientHttpRequest *http = data;
     StoreEntry *entry = http->entry;
-    MemObject *mem;
     const char *url = storeUrl(entry);
-    http_status status;
     if (entry == NULL) {
 	/* client aborted */
 	return;
@@ -735,7 +733,7 @@
 	clientHandleETagMiss(http);
 	return;
     }
-    debug(33, 3) ("clientHandleETagReply: %s = %d\n", url, (int) status);
+    debug(33, 3) ("clientHandleETagReply: %s = %d\n", url, (int) rep->sline.status);
     if (HTTP_NOT_MODIFIED == rep->sline.status) {
 	/* Remember the ETag and restart */
 	if (rep) {
@@ -750,7 +748,7 @@
 		vary = httpMakeVaryMark(request, rep);
 
 	    if (etag && vary) {
-		storeAddVary(mem->url, mem->method, NULL, httpHeaderGetStr(&rep->header, HDR_ETAG), request->vary_hdr, request->vary_headers, strBuf(request->vary_encoding));
+		storeAddVary(url, entry->mem_obj->method, NULL, httpHeaderGetStr(&rep->header, HDR_ETAG), request->vary_hdr, request->vary_headers, strBuf(request->vary_encoding));
 	    }
 	}
 	clientHandleETagMiss(http);