------------------------------------------------------------ revno: 13888 revision-id: squid3@treenet.co.nz-20150820134737-ykphoqnnlmr5izr8 parent: squid3@treenet.co.nz-20150820134636-2d0y39b107ty3ayb committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2015-08-20 06:47:37 -0700 message: Docs: update intercept/tproxy related text ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150820134737-ykphoqnnlmr5izr8 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: f2bea16559b76bfd6a43f29cb1acf25161232c72 # timestamp: 2015-08-20 13:51:04 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150820134636-\ # 2d0y39b107ty3ayb # # Begin patch === modified file 'src/cf.data.pre' --- src/cf.data.pre 2015-07-25 16:25:42 +0000 +++ src/cf.data.pre 2015-08-20 13:47:37 +0000 @@ -1380,7 +1380,7 @@ SECURITY WARNING: Usage of this option is dangerous and should not be used trivially. Correct configuration - of follow_x_forewarded_for with a limited set of trusted + of follow_x_forwarded_for with a limited set of trusted sources is required to prevent abuse of your proxy. DOC_END @@ -1704,13 +1704,13 @@ Modes: - intercept Support for IP-Layer interception of - outgoing requests without browser settings. - NP: disables authentication and IPv6 on the port. + intercept Support for IP-Layer NAT interception delivering + traffic to this Squid port. + NP: disables authentication on the port. - tproxy Support Linux TPROXY for spoofing outgoing - connections using the client IP address. - NP: disables authentication and maybe IPv6 on the port. + tproxy Support Linux TPROXY (or BSD divert-to) with spoofing + of outgoing connections using the client IP address. + NP: disables authentication on the port. accel Accelerator / reverse proxy mode