From 8d7573089019c92bd03ebff69ad0af4ca0e8e67b Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 21 Jun 2014 21:46:27 -0700 Subject: [PATCH] Update documentation for v2 protocol --- doc/release-notes/release-3.5.sgml | 5 ++++- src/cf.data.pre | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml index c2d88587b7..262768ca2a 100644 --- a/doc/release-notes/release-3.5.sgml +++ b/doc/release-notes/release-3.5.sgml @@ -171,7 +171,10 @@ Most user-facing changes are reflected in squid.conf (see below). relay the original client source details without having to alter or understand the protocol being relayed on the connection. -

Squid currently supports receiving version 1 of the protocol. +

Squid currently supports receiving version 1 or 2 of the protocol. + A port which has been configured to receive this protocol may only be used to + receive traffic from client software sending in this protocol. + Regular forward-proxy HTTP traffic is not accepted.

Squid can be configured by adding an http_port or https_port with the proxy-surrogate mode flag. The proxy_forwarded_access diff --git a/src/cf.data.pre b/src/cf.data.pre index dc8de91884..1abab6d6c9 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -1540,7 +1540,7 @@ DOC_START accel Accelerator / reverse proxy mode proxy-surrogate - Support for PROXY protocol version 1 connections. + Support for PROXY protocol version 1 or 2 connections. The proxy_forwarded_access is required to whitelist downstream proxies which can be trusted. -- 2.47.3