---------------------
PatchSet 6610 
Date: 2005/04/23 10:08:49
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Merge fixes

Members: 
	src/cachemgr.c:1.6.14.11->1.6.14.12 
	src/main.c:1.28.6.1.4.30->1.28.6.1.4.31 

Index: squid/src/cachemgr.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/cachemgr.c,v
retrieving revision 1.6.14.11
retrieving revision 1.6.14.12
diff -u -r1.6.14.11 -r1.6.14.12
--- squid/src/cachemgr.c	23 Apr 2005 08:45:02 -0000	1.6.14.11
+++ squid/src/cachemgr.c	23 Apr 2005 10:08:49 -0000	1.6.14.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cachemgr.c,v 1.6.14.11 2005/04/23 08:45:02 serassio Exp $
+ * $Id: cachemgr.c,v 1.6.14.12 2005/04/23 10:08:49 serassio Exp $
  *
  * DEBUG: section 0     CGI Cache Manager
  * AUTHOR: Duane Wessels
@@ -193,6 +193,7 @@
 static const char *make_auth_header(const cachemgr_request * req);
 
 static int check_target_acl(const char *hostname, int port);
+
 #ifdef _SQUID_MSWIN_
 static int s_iInitCount = 0;
 int Win32SockInit(void)
Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/main.c,v
retrieving revision 1.28.6.1.4.30
retrieving revision 1.28.6.1.4.31
diff -u -r1.28.6.1.4.30 -r1.28.6.1.4.31
--- squid/src/main.c	22 Apr 2005 18:48:49 -0000	1.28.6.1.4.30
+++ squid/src/main.c	23 Apr 2005 10:08:49 -0000	1.28.6.1.4.31
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.28.6.1.4.30 2005/04/22 18:48:49 serassio Exp $
+ * $Id: main.c,v 1.28.6.1.4.31 2005/04/23 10:08:49 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -49,7 +49,6 @@
 /* for error reporting from xmalloc and friends */
 extern void (*failure_notify) (const char *);
 
-static int opt_send_signal = -1;
 #if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_))
 static int opt_no_daemon = 1;
 #else