openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File 12489.patch of Package squid

---------------------
PatchSet 12489 
Date: 2009/06/25 22:53:15
Author: hno
Branch: SQUID_2_7
Tag: (none) 
Log:
Author: Mark Nottingham <mnot@pobox.com>
MFC: Bug #2642: Remove duplicate peerMonitorInit() on reconfigure

mainReconfigure() calls serverConnectionsOpen, which calls peerMonitorInit(),
and then calls peerMonitorInit() directly.

This has the effect of spawning a duplicate monitoring event for each peer
every time Squid is reconfigured.

Members: 
	src/main.c:1.403.2.3->1.403.2.4

Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid/squid/src/main.c,v
retrieving revision 1.403.2.3
retrieving revision 1.403.2.4
diff -u -r1.403.2.3 -r1.403.2.4
--- squid/src/main.c	25 Sep 2008 02:21:52 -0000	1.403.2.3
+++ squid/src/main.c	25 Jun 2009 22:53:15 -0000	1.403.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.403.2.3 2008/09/25 02:21:52 hno Exp $
+ * $Id: main.c,v 1.403.2.4 2009/06/25 22:53:15 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -456,7 +456,6 @@
     writePidFile();		/* write PID file */
     debug(1, 1) ("Ready to serve requests.\n");
     reconfiguring = 0;
-    peerMonitorInit();
 }
 
 static void

Places

File 12489.patch of Package squid

Places