From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 22 Jun 2014 04:46:27 +0000 (-0700)
Subject: Update documentation for v2 protocol
X-Git-Tag: SQUID_3_5_0_1~75^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d7573089019c92bd03ebff69ad0af4ca0e8e67b;p=thirdparty%2Fsquid.git

Update documentation for v2 protocol
---

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.
 
-<p>Squid currently supports receiving version 1 of the protocol.
+<p>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.
 
 <p>Squid can be configured by adding an <em>http_port</em> or <em>https_port</em>
    with the <em>proxy-surrogate</em> mode flag. The <em>proxy_forwarded_access</em>
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.