------------------------------------------------------------
revno: 13869
revision-id: squid3@treenet.co.nz-20150725163102-1ygfkb5ge611jd8i
parent: squid3@treenet.co.nz-20150725162542-i6ho0p3dwex7rxgr
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4251
author: Jose Luis Godoy <joseluis.godoy@correo.aeat.es>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sat 2015-07-25 09:31:02 -0700
message:
  Bug 4251: incorrect instance name for memory segments in /dev/shm
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150725163102-1ygfkb5ge611jd8i
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 26d79d8aa734c4edbf8c578d26d7ef5949fb7558
# timestamp: 2015-07-25 16:34:25 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150725162542-\
#   i6ho0p3dwex7rxgr
# 
# Begin patch
=== modified file 'src/ipc/mem/Segment.cc'
--- src/ipc/mem/Segment.cc	2015-03-03 14:41:07 +0000
+++ src/ipc/mem/Segment.cc	2015-07-25 16:31:02 +0000
@@ -213,8 +213,11 @@
         name.append(BasePath);
         if (name[name.size()-1] != '/')
             name.append('/');
-    } else
-        name.append("/squid-");
+    } else {
+        name.append('/');
+        name.append(service_name.c_str());
+        name.append('-');
+    }
 
     // append id, replacing slashes with dots
     for (const char *slash = strchr(id, '/'); slash; slash = strchr(id, '/')) {