Use correct socks5 proxy ibrowse options #3634
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With the move from using a forked ibrowse to upstream [1], the ibrowse options for socks5 proxy settings all changed to a `socks5_` prefix. [1] #3551
jaydoane
force-pushed
the
fix-socks5-proxy-support
branch
from
365c245
to
c9c50c3
Compare
nickva
approved these changes
Jun 25, 2021
There was a problem hiding this comment.
Good find, @jaydoane!
I totally missed this one when switching to upstream ibrowse
+1
This would apply to main too, but not as a cherry pick, I think. There we parse the endpoint data into a map in https://github.com/apache/couchdb/blob/main/src/couch_replicator/src/couch_replicator_parse.erl#L227 but that also, later gets "reconstituted" into an #httpdb record in https://github.com/apache/couchdb/blob/main/src/couch_replicator/src/couch_replicator_api_wrap.erl#L1020 so we would have to make sure the socks5_* params are handled properly in those cases.
nickva
added a commit
that referenced
this pull request
Jun 30, 2021
This is a port of the 3.x PR #3634 to main
nickva
added a commit
that referenced
this pull request
Jun 30, 2021
This is a port of the 3.x PR #3634 to main
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
With the move from using a forked ibrowse to upstream [1], the
ibrowse options for socks5 proxy settings all changed to a
socks5_prefix.
[1] #3551
Testing recommendations
Related Issues or Pull Requests
Checklist
rel/overlay/etc/default.ini