diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-21 20:07:34 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-11-22 21:03:25 +0000 |
| commit | 7f06582cc999eaa812a86d03e97a52711c541fd4 (patch) | |
| tree | bd937362bc6f39140a11b48aa7c7a01fd50b81c0 /doc/doc-txt | |
| parent | a159f203b559a406a5489f3ef2a60a61574bbb86 (diff) | |
SOCKS: Support priority groups and weighted-random selection from
multiple proxes. Bug 1720
Diffstat (limited to 'doc/doc-txt')
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/doc-txt/experimental-spec.txt | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index d650fc1c0..a199a8d0d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -104,6 +104,11 @@ GF/01 Bug 1715: Fix for race condition in exicyclog, where exim could attempt JH/20 Bug 1701: For MySQL lookups, support MySQL config file option group names. +JH/21 Bug 1720: Add support for priority groups and weighted-random proxy + selection for the EXPERIMENTAL_SOCKS feature, via new per-proxy options + "pri" and "weight". Note that the previous implicit priority given by the + list order is no longer honoured. + Exim version 4.86 ----------------- diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt index 74614cd3f..4f9504c05 100644 --- a/doc/doc-txt/experimental-spec.txt +++ b/doc/doc-txt/experimental-spec.txt @@ -1135,10 +1135,15 @@ These options are currently defined: - "pass" sets the authentication password. Default is empty. - "port" sets the tcp port number for the proxy. Default is 1080. - "tmo" sets a connection timeout in seconds for this proxy. Default is 5. - -Proxies from the list are tried in order until -one responds. The timeout for the overall connection -applies to the set of proxied attempts. +- "pri" specifies a priority for the server within the list, higher + values being tried first. The default priority is 1. +- "weight" specifies a selection bias. Within a priority set servers + are queried in a random fashion, weighted by this value. The default + value for selection bias is 1. + +Proxies from the list are tried according to their priority +and weight settings until one responds. The timeout for the +overall connection applies to the set of proxied attempts. If events are used, the remote IP/port during a tcp:connect event will be that of the proxy. |