diff options
| author | Phil Pennock <pdp@exim.org> | 2017-01-31 23:55:51 -0500 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2017-02-02 16:05:11 -0500 |
| commit | 2a23f96499d49162afc70fef92ff9bf49aa7ab5c (patch) | |
| tree | 14245f418df94bfa3b17ec996f7483778fa715a3 | |
| parent | 33a1a1bf0dc7d8202f09fda79e5a496645bbeb3b (diff) | |
| download | exim4-2a23f96499d49162afc70fef92ff9bf49aa7ab5c.tar.gz | |
Proxy clarification & nit fixes.
Release: should be cherry-picked into 4.89RC series
(cherry picked from commit bbfc5a3e3e0d4e150894edce2ae72bff24e4408b)
Signed-off-by: Phil Pennock <pdp@exim.org>
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 5cbc126a4..af359a19e 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -12282,7 +12282,7 @@ qualified host name. See also &$smtp_active_hostname$&. &$proxy_local_port$& &&& &$proxy_session$& These variables are only available when built with Proxy Protocol -or Socks5 support +or SOCKS5 support. For details see chapter &<<SECTproxyInbound>>&. .wen @@ -36131,7 +36131,7 @@ The latter can be disabled by turning off the &%outgoing_interface%& option. &%proxy%&: The internal (closest to the system running Exim) IP address of the proxy, tagged by PRX=, on the &"<="& line for a message accepted on a proxied connection -or the &"=>"& line for a message delivered on a proxied connection.. +or the &"=>"& line for a message delivered on a proxied connection. See &<<SECTproxyInbound>>& for more information. .next .cindex "log" "incoming remote port" @@ -38625,6 +38625,13 @@ recorded in an ACL (example is below). Use of a proxy is enabled by setting the &%hosts_proxy%& main configuration option to a hostlist; connections from these hosts will use Proxy Protocol. +Exim supports both version 1 and version 2 of the Proxy Protocol and +automatically determines which version is in use. + +The Proxy Protocol header is the first data received on a TCP connection +and is inserted before any TLS-on-connect handshake from the client; Exim +negotiates TLS between Exim-as-server and the remote client, not between +Exim and the proxy server. .new The following expansion variables are usable |