couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [17/23] couch-replicator commit: updated refs/heads/1843-feature-bigcouch to 4965655
Date Thu, 01 May 2014 14:07:04 GMT
Support SOCKS5 protocol for replication

Using "socks5" as the protocol in the "proxy" parameter of replication
requests will cause DNS resolution and data transfer to happen via a
SOCKS5 proxy server.

COUCHDB-2025


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/a65a6e0a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/a65a6e0a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/a65a6e0a

Branch: refs/heads/1843-feature-bigcouch
Commit: a65a6e0ad77ab1a1a21386332377eef34370a2d1
Parents: b58ffb9
Author: Robert Newson <rnewson@apache.org>
Authored: Sat Jan 4 17:32:00 2014 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Jan 6 23:34:53 2014 +0000

----------------------------------------------------------------------
 src/couch_replicator_utils.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/a65a6e0a/src/couch_replicator_utils.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_utils.erl b/src/couch_replicator_utils.erl
index 240d7d4..99ddebf 100644
--- a/src/couch_replicator_utils.erl
+++ b/src/couch_replicator_utils.erl
@@ -300,9 +300,10 @@ parse_proxy_params(ProxyUrl) ->
         host = Host,
         port = Port,
         username = User,
-        password = Passwd
+        password = Passwd,
+        protocol = Protocol
     } = ibrowse_lib:parse_url(ProxyUrl),
-    [{proxy_host, Host}, {proxy_port, Port}] ++
+    [{proxy_protocol, Protocol}, {proxy_host, Host}, {proxy_port, Port}] ++
         case is_list(User) andalso is_list(Passwd) of
         false ->
             [];


Mime
View raw message