From 245f66fce2dfee58449c7919d8629df521d978e3 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 30 May 2011 02:20:41 +1200 Subject: [PATCH] Prep for 3.1.12.2 --- ChangeLog | 20 ++++++++++ doc/release-notes/Makefile | 4 +- doc/release-notes/release-3.1.sgml | 7 +++- src/cf.data.pre | 62 +++++++++++++++++++----------- 4 files changed, 66 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index f18a533997..9d0bfe9dba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Changes to squid-3.1.12.2 (30 May 2011): + + - Bug 3226: Tags from external ACLs do not correctly expire + - Bug 3215: Malformed IPv6 DNS reverse lookup + - Bug 3209: ssl-bumped requests forwarded unencrypted to the parent proxies/caches + - Bug 3205: SSL-bump starts then hangs + - Bug 3178: gcc-4.6 complains unused variables + - Bug 3122: Unknown record type in WCCPv2 Packet (6) + - Bug 2965 (partial): Compile errors on MinGW + - Fix to only ssl-bump CONNECT requests if they are about to be tunneled + - Fix cache manager display of -i/+i in regex ACL config display + - Fix cache manager display of cache_peer options userhash and sourcehash + - Fix URL re-writer loosing many transaction details + - Fix always-true comparison in ICAP for some 32-bit platforms + - Support for 'slow' group ACLs in ssl_bump access control + - Support OpenSSL 1.0.0 built without SSLv2 + - Support GCC 4.6 and binutils-gold + - Add CSS id attribute to BODY tag of generated error pages. + - Display WARNING and ERROR when max_filedescriptors has failed + Changes to squid-3.1.12.1 (19 Apr 2011): - Port from 3.2: Dynamic SSL Certificate generation diff --git a/doc/release-notes/Makefile b/doc/release-notes/Makefile index 332f7e160c..f1f2af589c 100644 --- a/doc/release-notes/Makefile +++ b/doc/release-notes/Makefile @@ -14,9 +14,9 @@ $(DOC).ps: $(DOC).sgml %.txt: %.sgml linuxdoc -B txt --filter $< -$(DOC).html: $(DOC).sgml +%.html: %.sgml linuxdoc -B html -T 2 --split=0 $< - perl -i -p -e "s%$(DOC).html%%" $(DOC).html + perl -i -p -e "s%$@%%" $@ %.man: %.sgml linuxdoc -B txt -T 2 -m $(DOC) diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml index c8719ed817..ba96e18be1 100644 --- a/doc/release-notes/release-3.1.sgml +++ b/doc/release-notes/release-3.1.sgml @@ -1,6 +1,6 @@
-Squid 3.1.12.1 release notes +Squid 3.1.12.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.1.12.1 +The Squid Team are pleased to announce the release of Squid-3.1.12.2 This new release is available for download from or the . @@ -1096,6 +1096,9 @@ NOCOMMENT_START debug_options rotate=

New parameter rotate=N to control number of cache.log rotations independent of other logs. + deny_info +

Support 307 status for redirecting CONNECT tunnels with HTTPS traffic. + external_acl_type

New options 'ipv4' and 'ipv6' are added to set the IPv4/v6 protocol between Squid and its helpers. Please be aware of some limits to these options. These options only affet the transport protocol used diff --git a/src/cf.data.pre b/src/cf.data.pre index 595826ab23..23a7dd91e6 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -3229,10 +3229,10 @@ TYPE: wordlist LOC: Config.Program.redirect DEFAULT: none DOC_START - Specify the location of the executable for the URL rewriter. + Specify the location of the executable URL rewriter to use. Since they can perform almost any function there isn't one included. - For each requested URL rewriter will receive on line with the format + For each requested URL, the rewriter will receive on line with the format URL client_ip "/" fqdn user method [ kvpairs] @@ -3246,7 +3246,7 @@ DOC_START The rewriter can also indicate that a client-side redirect should be performed to the new URL. This is done by prefixing the returned - URL with "301:" (moved permanently) or 302: (moved temporarily). + URL with "301:" (moved permanently) or 302: (moved temporarily), etc. By default, a URL rewriter is not used. DOC_END @@ -4462,6 +4462,11 @@ DOC_START class 5 Requests are grouped according their tag (see external_acl's tag= reply). + + Each pool also requires a delay_parameters directive to configure the pool size + and speed limits used whenever the pool is applied to a request. Along with + a set of delay_access directives to determine when it is used. + NOTE: If an IP address is a.b.c.d -> bits 25 through 32 are "d" -> bits 17 through 24 are "c" @@ -4503,27 +4508,29 @@ LOC: Config.Delay DOC_START This defines the parameters for a delay pool. Each delay pool has a number of "buckets" associated with it, as explained in the - description of delay_class. For a class 1 delay pool, the syntax is: + description of delay_class. -delay_parameters pool aggregate + For a class 1 delay pool, the syntax is: + delay_pools pool 1 + delay_parameters pool aggregate For a class 2 delay pool: - -delay_parameters pool aggregate individual + delay_pools pool 2 + delay_parameters pool aggregate individual For a class 3 delay pool: - -delay_parameters pool aggregate network individual + delay_pools pool 3 + delay_parameters pool aggregate network individual For a class 4 delay pool: - -delay_parameters pool aggregate network individual user + delay_pools pool 4 + delay_parameters pool aggregate network individual user For a class 5 delay pool: + delay_pools pool 5 + delay_parameters pool tagrate -delay_parameters pool tagrate - - The variables here are: + The option variables are: pool a pool number - ie, a number between 1 and the number specified in delay_pools as used in @@ -4549,30 +4556,39 @@ delay_parameters pool tagrate quoted in bits) per second placed into the bucket, and maximum is the maximum number of bytes which can be in the bucket at any time. + There must be one delay_parameters line for each delay pool. + + For example, if delay pool number 1 is a class 2 delay pool as in the - above example, and is being used to strictly limit each host to 64kbps + above example, and is being used to strictly limit each host to 64Kbit/sec (plus overheads), with no overall limit, the line is: -delay_parameters 1 -1/-1 8000/8000 + delay_parameters 1 -1/-1 8000/8000 + + Note that 8 x 8000 KByte/sec -> 64Kbit/sec. Note that the figure -1 is used to represent "unlimited". + And, if delay pool number 2 is a class 3 delay pool as in the above - example, and you want to limit it to a total of 256kbps (strict limit) - with each 8-bit network permitted 64kbps (strict limit) and each - individual host permitted 4800bps with a bucket maximum size of 64kb + example, and you want to limit it to a total of 256Kbit/sec (strict limit) + with each 8-bit network permitted 64Kbit/sec (strict limit) and each + individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits to permit a decent web page to be downloaded at a decent speed (if the network is not being limited due to overuse) but slow down large downloads more significantly: -delay_parameters 2 32000/32000 8000/8000 600/8000 + delay_parameters 2 32000/32000 8000/8000 600/8000 + + Note that 8 x 32000 KByte/sec -> 256Kbit/sec. + 8 x 8000 KByte/sec -> 64Kbit/sec. + 8 x 600 Byte/sec -> 4800bit/sec. - There must be one delay_parameters line for each delay pool. Finally, for a class 4 delay pool as in the example - each user will - be limited to 128Kb no matter how many workstations they are logged into.: + be limited to 128Kbits/sec no matter how many workstations they are logged into.: -delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000 + delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000 DOC_END NAME: delay_initial_bucket_level -- 2.47.2