From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 28 Jan 2016 01:49:55 +0000 (-0700)
Subject: Fixed cleanup of a shared memory segment in an unusual configuration.
X-Git-Tag: SQUID_4_0_5~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f95b92b7d0a4c56bba165ae26984d26caa683f4;p=thirdparty%2Fsquid.git

Fixed cleanup of a shared memory segment in an unusual configuration.

Squid was not removing squid-squid-page-pool.shm at exit when started
in non-daemon mode (-N). That segment is used in non-SMP mode if
memory_cache_shared is explicitly set to "on" (an unusual
configuration primarily useful for testing).
---

diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index 8704842a55..0502129b26 100644
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -131,9 +131,6 @@ SharedMemPagesRr::open()
 
 SharedMemPagesRr::~SharedMemPagesRr()
 {
-    if (!UsingSmp())
-        return;
-
     delete ThePagePool;
     ThePagePool = NULL;
     delete owner;