------------------------------------------------------------ revno: 13196 tags: SQUID_3_4_10 revision-id: squid3@treenet.co.nz-20141209162655-c7f1lpls60tvhms1 parent: squid3@treenet.co.nz-20141208120722-d18th9o9244nuruz committer: Amos Jeffries branch nick: 3.4 timestamp: Tue 2014-12-09 08:26:55 -0800 message: 3.4.10 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141209162655-c7f1lpls60tvhms1 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 5a0cf37c8831f3b8bd4c1aba57cc9dafdf5bd740 # timestamp: 2014-12-09 16:38:45 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20141208120722-\ # d18th9o9244nuruz # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2014-10-31 09:21:51 +0000 +++ ChangeLog 2014-12-09 16:26:55 +0000 @@ -1,3 +1,14 @@ +Changes to squid-3.4.10 (09 Dec 2014): + + - Bug 4148: external_acl_type header format does not accept the new libformat syntax + - Bug 4145: squid_endian.h compile errors with OpenBSD 5.6 + - Bug 4033: Rebuild corrupted ssl_db/size file + - Bug 3902: Docs: external_acl_type cache hash key + - Fix segmentation fault in ACL urlpath_regex + - Fix bootstrap.sh dependency on SPONSORS.list + - Alternate-Protocol is a hop-by-hop header + - HTTP/2: Support 421 (Misdirected Request) status code + Changes to squid-3.4.9 (31 Oct 2014): - Regression fix: ext_kerberos_ldap_group_acl typo in 3.4.7 update === modified file 'configure.ac' --- configure.ac 2014-12-03 11:53:03 +0000 +++ configure.ac 2014-12-09 16:26:55 +0000 @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.4.9-BZR],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.4.10-BZR],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) === removed file 'doc/README.wccpv2' --- doc/README.wccpv2 2008-03-22 00:58:20 +0000 +++ doc/README.wccpv2 1970-01-01 00:00:00 +0000 @@ -1,62 +0,0 @@ -This version of squid has been patched with the wccpv2 support patch. To -enable this option, use the --enable-wccpv2 option on the configure script. - -Wccpv2 allows a single cache to associate itself with multiple routers, and -also allows multiple wccp services to be defined. The other advantage of -wccpv2 is that the cisco IOS uses CEF to switch the packets. - -Example simple web cache ------------------------- - -Internet <-> fa0/0 2621 fa0/1 <-> cache, internal network - -squid.conf: - -wccp2_router 192.168.2.1:2048 -wccp2_version 4 -wccp2_forwarding_method 1 -wccp2_return_method 1 -wccp2_service standard 0 - -Router config: - -ip wccp web-cache -! -interface FastEthernet0/0 - description uplink - ip address 192.168.1.200 255.255.255.0 - ip wccp web-cache redirect out - duplex auto - speed auto -! -interface FastEthernet0/1 - description local network - ip address 192.168.2.1 255.255.255.0 - duplex auto - speed auto -! - -Note the cache is on the internal network (Fa0/1), the interception occurs -on the uplink interface(0/0). - -Linux (Kernel 2.6.10, i386) side of things: - -#!/bin/sh -echo "1" > /proc/sys/net/ipv4/ip_forward -echo "0" > /proc/sys/net/ipv4/conf/all/rp_filter -iptunnel add gre1 mode gre remote 192.168.2.1 local 192.168.2.2 dev eth0 -ifconfig gre1 up 127.0.0.2 -iptables -t nat -F -# iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 3128 -iptables -t nat -A PREROUTING -i gre1 -p tcp -m tcp --dport 80 -j DNAT --to-destination 192.168.2.2:3128 - - -TODO ----- - -* The wccp2 router configuration need to have a better configuration interface - (it currently uses ip:port when only the ip address is needed). -* A shutting-down cache should generate a removal query, informing the router - (and therefore the caches in the group) that this cache is going - away and no new traffic should be forwarded to it. -* Some more documentation, examples, etc. === modified file 'doc/release-notes/release-3.4.html' --- doc/release-notes/release-3.4.html 2014-10-31 09:21:51 +0000 +++ doc/release-notes/release-3.4.html 2014-12-09 16:26:55 +0000 @@ -2,10 +2,10 @@ - Squid 3.4.9 release notes + Squid 3.4.10 release notes -

Squid 3.4.9 release notes

+

Squid 3.4.10 release notes

Squid Developers

@@ -57,7 +57,7 @@

1. Notice

-

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

+

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

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

=== modified file 'doc/release-notes/release-3.4.sgml' --- doc/release-notes/release-3.4.sgml 2014-10-31 09:21:51 +0000 +++ doc/release-notes/release-3.4.sgml 2014-12-09 16:26:55 +0000 @@ -1,6 +1,6 @@
-Squid 3.4.9 release notes +Squid 3.4.10 release notes Squid Developers @@ -13,7 +13,7 @@ Notice

-The Squid Team are pleased to announce the release of Squid-3.4.9 for testing. +The Squid Team are pleased to announce the release of Squid-3.4.10 for testing. This new release is available for download from or the . === modified file 'src/wccp2.cc' --- src/wccp2.cc 2014-04-06 04:37:08 +0000 +++ src/wccp2.cc 2014-12-09 16:26:55 +0000 @@ -1071,13 +1071,18 @@ return; } + /* TODO A shutting-down cache should generate a removal query, informing the router + * (and therefore the caches in the group) that this cache is going + * away and no new traffic should be forwarded to it. + */ + if (theWccp2Connection > -1) { debugs(80, DBG_IMPORTANT, "FD " << theWccp2Connection << " Closing WCCPv2 socket"); comm_close(theWccp2Connection); theWccp2Connection = -1; } - /* for each router on each service send a packet */ + /* free all stored router state */ service_list_ptr = wccp2_service_list_head; while (service_list_ptr != NULL) {