From: Amos Jeffries Date: Wed, 23 Apr 2014 14:01:34 +0000 (-0700) Subject: 3.4.4.2 X-Git-Tag: SQUID_3_4_4_2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9138909421de63e9e707b661c47c182353af5d;p=thirdparty%2Fsquid.git 3.4.4.2 --- diff --git a/ChangeLog b/ChangeLog index 808a3c5418..5b3cdf2f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes to squid-3.4.4.2 (23 Apr 2014): + + - version bump for packaging re-build with altered toolchain + Changes to squid-3.4.4.1 (23 Apr 2014): - Regression Bug 4019: Cache digest exchange segmentation fault diff --git a/configure.ac b/configure.ac index bf6f17bf49..a2b797984a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.4.4.1-BZR],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.4.4.2-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.4.html b/doc/release-notes/release-3.4.html index a10acbf08e..503729090d 100644 --- a/doc/release-notes/release-3.4.html +++ b/doc/release-notes/release-3.4.html @@ -2,10 +2,10 @@ - Squid 3.4.4.1 release notes + Squid 3.4.4.2 release notes -

Squid 3.4.4.1 release notes

+

Squid 3.4.4.2 release notes

Squid Developers


@@ -57,7 +57,7 @@ for Applied Network Research and members of the Web Caching community.

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.4.4.1 for testing.

+

The Squid Team are pleased to announce the release of Squid-3.4.4.2 for testing.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.4/ or the mirrors.

diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml index 0398ce4dfa..3095a1bd3d 100644 --- a/doc/release-notes/release-3.4.sgml +++ b/doc/release-notes/release-3.4.sgml @@ -1,6 +1,6 @@
-Squid 3.4.4.1 release notes +Squid 3.4.4.2 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.4.4.1 for testing. +The Squid Team are pleased to announce the release of Squid-3.4.4.2 for testing. This new release is available for download from or the . diff --git a/src/cf.data.pre b/src/cf.data.pre index f5a8b125da..61c36e4f82 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -64,6 +64,17 @@ COMMENT_START from causing Squid entering an infinite loop whilst trying to load configuration files. + Values with byte units + + Squid accepts size units on some size related directives. All + such directives are documented with a default value displaying + a unit. + + Units accepted by Squid are: + bytes - byte + KB - Kilobyte (1024 bytes) + MB - Megabyte + GB - Gigabyte Values with spaces, quotes, and other special characters @@ -3329,6 +3340,41 @@ DOC_START and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html. DOC_END +NAME: minimum_object_size +COMMENT: (bytes) +TYPE: b_int64_t +DEFAULT: 0 KB +DEFAULT_DOC: no limit +LOC: Config.Store.minObjectSize +DOC_START + Objects smaller than this size will NOT be saved on disk. The + value is specified in bytes, and the default is 0 KB, which + means all responses can be stored. +DOC_END + +NAME: maximum_object_size +COMMENT: (bytes) +TYPE: b_int64_t +DEFAULT: 4 MB +LOC: Config.Store.maxObjectSize +DOC_START + Set the default value for max-size parameter on any cache_dir + which follow. + + The value is specified in bytes, and the default is 4 MB. + + If you wish to get a high BYTES hit ratio, you should probably + increase this (one 32 MB object hit counts for 3200 10KB + hits). + + If you wish to increase hit ratio more than you want to + save bandwidth you should leave this low. + + NOTE: if using the LFUDA replacement policy you should increase + this value to maximize the byte hit rate improvement of LFUDA! + See cache_replacement_policy for a discussion of this policy. +DOC_END + NAME: cache_dir TYPE: cachedir DEFAULT: none @@ -3489,9 +3535,10 @@ DOC_START max-size=n the maximum object size in bytes this cache_dir supports. - The value in maximum_object_size directive, sets - a default unless more specific details are available - about the cache_dir (ie a small store capacity). + The value in maximum_object_size directive above + this cache_dir line sets a default unless more + specific details are available (ie a small store + capacity). Note: To make optimal use of the max-size limits you should order the cache_dir lines with the smallest max-size value first. @@ -3568,40 +3615,6 @@ DOC_START A value of 0 indicates no limit. DOC_END -NAME: minimum_object_size -COMMENT: (bytes) -TYPE: b_int64_t -DEFAULT: 0 KB -DEFAULT_DOC: no limit -LOC: Config.Store.minObjectSize -DOC_START - Objects smaller than this size will NOT be saved on disk. The - value is specified in bytes, and the default is 0 KB, which - means all responses can be stored. -DOC_END - -NAME: maximum_object_size -COMMENT: (bytes) -TYPE: b_int64_t -DEFAULT: 4 MB -LOC: Config.Store.maxObjectSize -DOC_START - The default limit on size of objects stored to disk. - This size is used for cache_dir where max-size is not set. - The value is specified in bytes, and the default is 4 MB. - - If you wish to get a high BYTES hit ratio, you should probably - increase this (one 32 MB object hit counts for 3200 10KB - hits). - - If you wish to increase hit ratio more than you want to - save bandwidth you should leave this low. - - NOTE: if using the LFUDA replacement policy you should increase - this value to maximize the byte hit rate improvement of LFUDA! - See replacement_policy below for a discussion of this policy. -DOC_END - NAME: cache_swap_low COMMENT: (percent, 0-100) TYPE: int @@ -8881,6 +8894,7 @@ DOC_END NAME: high_memory_warning TYPE: b_size_t LOC: Config.warnings.high_memory +IFDEF: HAVE_MSTATS&&HAVE_GNUMALLOC_H DEFAULT: 0 KB DEFAULT_DOC: disabled. DOC_START diff --git a/src/cf_gen_defines b/src/cf_gen_defines index 2e7b2c6a86..3fa0202c69 100644 --- a/src/cf_gen_defines +++ b/src/cf_gen_defines @@ -5,25 +5,30 @@ BEGIN { print "*/" print "#include \"autoconf.h\"" print "static struct { const char *name; const char *enable; int defined;} defines[] = {" - define["USE_DELAY_POOLS"]="--enable-delay-pools" + define["_SQUID_WINDOWS_"]="MS Windows" define["FOLLOW_X_FORWARDED_FOR"]="--enable-follow-x-forwarded-for" - define["FOLLOW_X_FORWARDED_FOR&&USE_DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools" - define["FOLLOW_X_FORWARDED_FOR&&USE_ADAPTATION"]="--enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)" define["FOLLOW_X_FORWARDED_FOR&&LINUX_NETFILTER"]="--enable-follow-x-forwarded-for and --enable-linux-netfilter" - define["USE_HTTP_VIOLATIONS"]="--enable-http-violations" + define["FOLLOW_X_FORWARDED_FOR&&USE_ADAPTATION"]="--enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)" + define["FOLLOW_X_FORWARDED_FOR&&USE_DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools" + define["HAVE_MSTATS&&HAVE_GNUMALLOC_H"]="GNU Malloc with mstats()" define["ICAP_CLIENT"]="--enable-icap-client" + define["SO_MARK&&USE_LIBCAP"]="Packet MARK (Linux)" define["SQUID_SNMP"]="--enable-snmp" define["USE_ADAPTATION"]="--enable-ecap or --enable-icap-client" define["USE_AUTH"]="--enable-auth" define["USE_CACHE_DIGESTS"]="--enable-cache-digests" + define["USE_DELAY_POOLS"]="--enable-delay-pools" define["USE_DNSHELPER"]="--disable-internal-dns" define["!USE_DNSHELPER"]="--enable-internal-dns" define["USE_ECAP"]="--enable-ecap" define["USE_ERR_LOCALES"]="--enable-auto-locale" define["USE_HTCP"]="--enable-htcp" + define["USE_HTTP_VIOLATIONS"]="--enable-http-violations" define["USE_ICMP"]="--enable-icmp" define["USE_IDENT"]="--enable-ident-lookups" define["USE_LOADABLE_MODULES"]="--enable-loadable-modules" + define["USE_OPENSSL"]="--with-openssl" + define["USE_QOS_TOS"]="--enable-zph-qos" define["USE_SQUID_ESI"]="--enable-esi" define["USE_SQUID_EUI"]="--enable-eui" define["USE_SSL_CRTD"]="--enable-ssl-crtd" @@ -31,9 +36,6 @@ BEGIN { define["USE_UNLINKD"]="--enable-unlinkd" define["USE_WCCP"]="--enable-wccp" define["USE_WCCPv2"]="--enable-wccpv2" - define["USE_QOS_TOS"]="--enable-zph-qos" - define["_SQUID_WINDOWS_"]="MS Windows" - define["SO_MARK&&USE_LIBCAP"]="Packet MARK (Linux)" } /^IFDEF:/ { if (define[$2] != "")