---------------------
PatchSet 6686 
Date: 2005/05/31 12:59:57
Author: hno
Branch: ssl-2_5
Tag: (none) 
Log:
Remove unused variable (merge conflict)

Members: 
	src/comm.c:1.18.6.2.8.6->1.18.6.2.8.7 

Index: squid/src/comm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm.c,v
retrieving revision 1.18.6.2.8.6
retrieving revision 1.18.6.2.8.7
diff -u -r1.18.6.2.8.6 -r1.18.6.2.8.7
--- squid/src/comm.c	16 Feb 2005 00:45:03 -0000	1.18.6.2.8.6
+++ squid/src/comm.c	31 May 2005 12:59:57 -0000	1.18.6.2.8.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.c,v 1.18.6.2.8.6 2005/02/16 00:45:03 hno Exp $
+ * $Id: comm.c,v 1.18.6.2.8.7 2005/05/31 12:59:57 hno Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -721,7 +721,6 @@
 	pconnHistCount(1, F->uses);
 #if USE_SSL
     if (F->ssl) {
-	SSL *ssl = F->ssl;
 	if (!F->flags.close_request) {
 	    F->flags.close_request = 1;
 	    commSetTimeout(fd, 10, comm_close_ssl_timeout, NULL);