From: Amos Jeffries Date: Sat, 28 Jan 2017 03:54:15 +0000 (+1300) Subject: 3.5.24 X-Git-Tag: SQUID_3_5_24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5c8470f1e6ca0802d427bf905fb1c1d43710cec;p=thirdparty%2Fsquid.git 3.5.24 --- diff --git a/ChangeLog b/ChangeLog index f30b3d9c9a..05d3524cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Changes to squid-3.5.24 (28 Jan 2017): + + - Regression Bug 3940: Make 'cache deny' do what is documented + - TLS: Fix SSLv2 records bumping despite a matching step2 peek rule + - TLS: Mitigate DoS attacks that use client-initiated SSL/TLS renegotiation + - Fix "Source and destination overlap in memcpy" Valgrind errors + - Reduce crashes due to unexpected ClientHttpRequest termination + - Update External ACL helpers error handling and caching + - Detect HTTP header ACL issues + - ... and some documentation fixes + Changes to squid-3.5.23 (16 Dec 2016): - Bug 4627: fix generate-host-certificates and dynamic_cert_mem_cache_size docs diff --git a/configure.ac b/configure.ac index bd36f7c114..e19e19e9aa 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[3.5.23-BZR],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.5.24-BZR],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml index 92e0cfd75d..7b8fa846ef 100644 --- a/doc/release-notes/release-3.5.sgml +++ b/doc/release-notes/release-3.5.sgml @@ -1,6 +1,6 @@
-Squid 3.5.23 release notes +Squid 3.5.24 release notes Squid Developers @@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community. Notice

-The Squid Team are pleased to announce the release of Squid-3.5.23. +The Squid Team are pleased to announce the release of Squid-3.5.24. This new release is available for download from or the . diff --git a/include/MemPool.h b/include/MemPool.h index 74b1272e6a..49b12eb8a3 100644 --- a/include/MemPool.h +++ b/include/MemPool.h @@ -408,13 +408,14 @@ struct _MemPoolGlobalStats { }; /// \ingroup MemPoolsAPI +/// Creates a named MemPool of elements with the given size #define memPoolCreate MemPools::GetInstance().create /* Allocator API */ /** \ingroup MemPoolsAPI * Initialise iteration through all of the pools. - \retval Iterator for use by memPoolIterateNext() and memPoolIterateDone() + * \returns Iterator for use by memPoolIterateNext() and memPoolIterateDone() */ extern MemPoolIterator * memPoolIterate(void); @@ -434,10 +435,12 @@ extern void memPoolIterateDone(MemPoolIterator ** iter); \ingroup MemPoolsAPI \todo Stats API - not sured how to refactor yet * - * Fills MemPoolGlobalStats with statistical data about overall + * Fills a MemPoolGlobalStats with statistical data about overall * usage for all pools. * - \retval Number of pools that have at least one object in use. + * \param stats Object to be filled with statistical data. + * + * \return Number of pools that have at least one object in use. * Ie. number of dirty pools. */ extern int memPoolGetGlobalStats(MemPoolGlobalStats * stats); diff --git a/src/Mem.h b/src/Mem.h index 57c1d5fe95..0afccb8e97 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -39,14 +39,17 @@ protected: extern const size_t squidSystemPageSize; +/// Main cleanup handler. void memClean(void); void memInitModule(void); void memCleanModule(void); void memConfigure(void); +/// Allocate one element from the typed pool void *memAllocate(mem_type); void *memAllocString(size_t net_size, size_t * gross_size); void *memAllocBuf(size_t net_size, size_t * gross_size); void *memReallocBuf(void *buf, size_t net_size, size_t * gross_size); +/// Free a element allocated by memAllocate() void memFree(void *, int type); void memFreeString(size_t size, void *); void memFreeBuf(size_t size, void *);