From: wessels <>
Date: Wed, 8 Apr 1998 22:56:32 +0000 (+0000)
Subject: memInit() needs to go before config parsing
X-Git-Tag: SQUID_3_0_PRE1~3569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f75c559ad03af423d2fdbbabaab2321d5db3f51;p=thirdparty%2Fsquid.git

memInit() needs to go before config parsing
---

diff --git a/src/main.cc b/src/main.cc
index 4dd57a1849..b65da428b3 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.244 1998/04/06 22:32:15 wessels Exp $
+ * $Id: main.cc,v 1.245 1998/04/08 16:56:32 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -432,8 +432,10 @@ mainInitialize(void)
     squid_signal(SIGPIPE, SIG_IGN, SA_RESTART);
     squid_signal(SIGCHLD, sig_child, SA_NODEFER | SA_RESTART);
 
-    if (!configured_once)
+    if (!configured_once) {
 	cbdataInit();
+	memInit();		/* memInit must go before config parsing */
+    }
     if (ConfigFile == NULL)
 	ConfigFile = xstrdup(DefaultConfigFile);
     parseConfigFile(ConfigFile);
@@ -456,10 +458,8 @@ mainInitialize(void)
     debug(1, 0) ("Process ID %d\n", (int) getpid());
     debug(1, 1) ("With %d file descriptors available\n", Squid_MaxFD);
 
-    if (!configured_once) {
-	memInit();		/* memInit must go before at least redirect */
+    if (!configured_once)
 	disk_init();		/* disk_init must go before ipcache_init() */
-    }
     ipcache_init();
     fqdncache_init();
     dnsOpenServers();