summaryrefslogtreecommitdiff
path: root/doc/doc-txt/experimental-spec.txt
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-11-21 20:07:34 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-11-22 21:03:25 +0000
commit7f06582cc999eaa812a86d03e97a52711c541fd4 (patch)
treebd937362bc6f39140a11b48aa7c7a01fd50b81c0 /doc/doc-txt/experimental-spec.txt
parenta159f203b559a406a5489f3ef2a60a61574bbb86 (diff)
SOCKS: Support priority groups and weighted-random selection from
multiple proxes. Bug 1720
Diffstat (limited to 'doc/doc-txt/experimental-spec.txt')
-rw-r--r--doc/doc-txt/experimental-spec.txt13
1 files changed, 9 insertions, 4 deletions
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.