From a111f6a34ba82ef718ff12683a0aac79e17bcdfe Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 8 Mar 2013 17:24:34 +0000 Subject: Changes 3.3.2: Docs: document ConnOpener::swanSong() better Bug 3329: Quieten orphan Comm::Connection messages Sync TESTDIR names used by testCoss and testUfs with testRock changes. MacOS: reduce the testRock unit test UDS path Bug 3720: SourceLayout: shuffle fd_table definition into fde.h Bug 3794: MacOS: workaround compiler errors and case-insensitivity Polish debugs in cacheability test Bug 3753: Removes the domain from the cache_peer server pconn key Bug 3781: Proxy Authentication not sent to cache_peer Bug 3763: diskd Error: no filename in shm buffer Solaris: Fix xstrto*() function linkages Mentioned creation of diskers in cache_dir rock documentation. Fix coverity scan issue 740457: unsecure temporary file creation Bug 3686: cache_dir max-size default fails Bug 3752: objects that cannot be cached in memory are not cached on disk if cache_dir max-size is used. --- .../patches/patch-src_DiskIO_DiskDaemon_diskd.cc | 36 ---------------------- www/squid3/patches/patch-src_acl_DomainData.cc | 15 --------- www/squid3/patches/patch-src_acl_Url.cc | 15 --------- 3 files changed, 66 deletions(-) delete mode 100644 www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc delete mode 100644 www/squid3/patches/patch-src_acl_DomainData.cc delete mode 100644 www/squid3/patches/patch-src_acl_Url.cc (limited to 'www/squid3/patches') diff --git a/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc b/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc deleted file mode 100644 index acdbedc9e4d..00000000000 --- a/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-src_DiskIO_DiskDaemon_diskd.cc,v 1.1 2013/02/19 19:22:45 markd Exp $ - ------------------------------------------------------------- -revno: 12497 -revision-id: squid3@treenet.co.nz-20130214091437-0kf8k09qf1sg8ker -parent: squid3@treenet.co.nz-20130214091347-nkfdacfkt0urnwq4 -fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3763 -committer: Amos Jeffries -branch nick: 3.3 -timestamp: Thu 2013-02-14 02:14:37 -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-20130214091437-0kf8k09qf1sg8ker -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 -# testament_sha1: 6098b2dbc1bcd0230017a40b0ebd75e375148fec -# timestamp: 2013-02-14 09:15:28 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 -# base_revision_id: squid3@treenet.co.nz-20130214091347-\ -# nkfdacfkt0urnwq4 -# -# Begin patch -=== modified file 'src/DiskIO/DiskDaemon/diskd.cc' ---- src/DiskIO/DiskDaemon/diskd.cc 2013-01-02 10:09:54 +0000 -+++ src/DiskIO/DiskDaemon/diskd.cc 2013-02-14 09:14:37 +0000 -@@ -264,7 +264,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; - } - diff --git a/www/squid3/patches/patch-src_acl_DomainData.cc b/www/squid3/patches/patch-src_acl_DomainData.cc deleted file mode 100644 index 157e9358922..00000000000 --- a/www/squid3/patches/patch-src_acl_DomainData.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_acl_DomainData.cc,v 1.1 2013/02/10 18:16:53 adam Exp $ - -On case-insensitive file systems acl/Url.h might get included. - ---- src/acl/DomainData.cc.orig 2013-02-10 13:30:18.000000000 +0000 -+++ src/acl/DomainData.cc -@@ -38,7 +38,7 @@ - #include "cache_cf.h" - #include "Debug.h" - #include "wordlist.h" --#include "URL.h" -+#include "../URL.h" - - template - inline void diff --git a/www/squid3/patches/patch-src_acl_Url.cc b/www/squid3/patches/patch-src_acl_Url.cc deleted file mode 100644 index 7d202461162..00000000000 --- a/www/squid3/patches/patch-src_acl_Url.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_acl_Url.cc,v 1.1 2013/02/10 18:16:53 adam Exp $ - -On case-insensitive file systems acl/Url.h might get included. - ---- src/acl/Url.cc.orig 2013-02-10 13:41:53.000000000 +0000 -+++ src/acl/Url.cc -@@ -37,7 +37,7 @@ - #include "acl/Checklist.h" - #include "acl/RegexData.h" - #include "rfc1738.h" --#include "URL.h" -+#include "../URL.h" - - int - ACLUrlStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) -- cgit v1.2.3