couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [5/8] couch-replicator commit: updated refs/heads/1843-feature-bigcouch to a8add8b
Date Fri, 25 Apr 2014 12:10:58 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/7cd0c4f1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/7cd0c4f1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/7cd0c4f1

Branch: refs/heads/1843-feature-bigcouch
Commit: 7cd0c4f1f7090b3f196a8ec0cbe343359f2edb9a
Parents: dd1c629
Author: Robert Newson <rnewson@apache.org>
Authored: Sat Jan 4 17:32:00 2014 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Apr 24 15:36:19 2014 +0100

----------------------------------------------------------------------
 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/7cd0c4f1/src/couch_replicator_utils.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_utils.erl b/src/couch_replicator_utils.erl
index 8a22f7f..dff8e50 100644
--- a/src/couch_replicator_utils.erl
+++ b/src/couch_replicator_utils.erl
@@ -301,9 +301,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