diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 16:56:15 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 16:56:15 +0000 |
| commit | f0989ec0ec69cc6a881ef9f7f118194c04875a36 (patch) | |
| tree | 6caf0547ffde0370cbbbb6599b74f7ef53c976e4 /doc | |
| parent | 74f150bf80451e34b2fae10c14019e37d644420a (diff) | |
SOCKS: downgrade from DISABLE_SOCKS to SUPPORT_SOCKS in Local/Makefile
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 3 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 677b4ef50..73887d4e7 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -38032,7 +38032,8 @@ Proxies may provide a security, availability or load-distribution function. .cindex SOCKS proxy Exim has support for sending outbound SMTP via a proxy using a protocol called SOCKS5 (defined by RFC1928). -The support can be removed by defining DISABLE_SOCKS=yes in Local/Makefile. +The support can be optionally included by defining SUPPORT_SOCKS=yes in +Local/Makefile. Use of a proxy is enabled by setting the &%socks_proxy%& on an smtp transport. The option value is expanded and should then be a list diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index e78f49cf4..d57c3db00 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -112,8 +112,8 @@ JH/21 Bug 1720: Add support for priority groups and weighted-random proxy JH/22 Bugs 963, 1721: Fix some corner cases in message body canonicalisation for DKIM processing. -JH/23 Move SOCKS5 support from Experimental to mainline. It can be left out - from a build by defining DISABLE_SOCKS. +JH/23 Move SOCKS5 support from Experimental to mainline, enabled for a build + by defining SUPPORT_SOCKS. Exim version 4.86 |