------------------------------------------------------------ revno: 13964 revision-id: squid3@treenet.co.nz-20151218125335-7hz4mvu4ar2vm3nr parent: squid3@treenet.co.nz-20151218125046-zcy17mbytb0h0c0d fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4397 author: Stephen Welker committer: Amos Jeffries branch nick: 3.5 timestamp: Sat 2015-12-19 01:53:35 +1300 message: Bug 4397: DragonFly BSD, POSIX shared memory is implemented as filepath ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20151218125335-7hz4mvu4ar2vm3nr # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 6996392841bda1d41ba4b44880e4439b1a0ed254 # timestamp: 2015-12-18 12:55:38 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20151218125046-\ # zcy17mbytb0h0c0d # # Begin patch === modified file 'compat/shm.cc' --- compat/shm.cc 2015-01-13 09:13:49 +0000 +++ compat/shm.cc 2015-12-18 12:53:35 +0000 @@ -22,7 +22,7 @@ bool shm_portable_segment_name_is_path() { -#if _SQUID_HPUX_ || _SQUID_OSF_ || defined(__vms) || (_SQUID_FREEBSD_ && (__FreeBSD__ < 7)) +#if _SQUID_HPUX_ || _SQUID_OSF_ || defined(__vms) || (_SQUID_FREEBSD_ && (__FreeBSD__ < 7)) || _SQUID_DRAGONFLY_ return true; #elif _SQUID_FREEBSD_ int jailed = 0;