------------------------------------------------------------
revno: 11786
revision-id: squid3@treenet.co.nz-20130216023004-xq9lgu59vvbbior8
parent: squid3@treenet.co.nz-20130216022911-v1yaiyod1f7udo3f
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3763
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Fri 2013-02-15 19:30:04 -0700
message:
  Bug 3763: diskd Error: no filename in shm buffer
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130216023004-xq9lgu59vvbbior8
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 2e8bcb15acc34a963ea8d7d0687dcfddf72c318e
# timestamp: 2013-02-16 02:30:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20130216022911-\
#   v1yaiyod1f7udo3f
# 
# Begin patch
=== modified file 'src/DiskIO/DiskDaemon/diskd.cc'
--- src/DiskIO/DiskDaemon/diskd.cc	2013-01-28 05:43:11 +0000
+++ src/DiskIO/DiskDaemon/diskd.cc	2013-02-16 02:30:04 +0000
@@ -266,7 +266,7 @@
 
     if (s->shm_offset > -1)
         buf = shmbuf + s->shm_offset;
-    else {
+    else if (r->mtype != _MQD_CLOSE) {
         fprintf(stderr, "%d UNLNK id(%u) Error: no filename in shm buffer\n", (int) mypid, s->id);
         return;
     }