Merge branch '2025-feature-socks5'
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1c0fe365 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1c0fe365 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1c0fe365 Branch: refs/heads/master Commit: 1c0fe36523c54d752aad49c8af3cceb745f3661f Parents: 4e9335e 9dd093d Author: Robert Newson <[email protected]> Authored: Mon Jan 6 23:38:00 2014 +0000 Committer: Robert Newson <[email protected]> Committed: Mon Jan 6 23:38:00 2014 +0000 ---------------------------------------------------------------------- share/doc/src/api/server/common.rst | 2 +- share/doc/src/whatsnew/1.6.rst | 1 + .../src/couch_replicator_utils.erl | 5 +- src/ibrowse/Makefile.am | 2 + src/ibrowse/ibrowse_http_client.erl | 62 +++++++---- src/ibrowse/ibrowse_lib.erl | 7 +- src/ibrowse/ibrowse_socks5.erl | 109 +++++++++++++++++++ 7 files changed, 163 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
