Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add support for SOCKS4 (#610) #2400

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Conversation

Jaltaire
Copy link
Contributor

This adds support for SOCKS4 proxies, implementing #610.

@Jaltaire
Copy link
Contributor Author

Added a simple example here to test that everything works as expected: https://github.com/Jaltaire/reqwest/blob/examples/examples/socks4.rs.

We can merge this too, if desired.

@Jaltaire
Copy link
Contributor Author

Also added a bump of tokio-socks to 0.5.2 since 0.5.2 makes SOCKS4 implementation feature-complete: https://github.com/sticnarf/tokio-socks/releases/tag/v0.5.2.

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 3, 2024

@seanmonstar Would you mind taking a look at this?

@Jaltaire Jaltaire force-pushed the master branch 2 times, most recently from b0dd83b to e67902f Compare September 9, 2024 07:50
@seanmonstar
Copy link
Owner

Thanks for working on this! Looks good, I'll start CI :)

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

My pleasure. :)

@seanmonstar, I just re-pushed with the cargo fmt fixes. Would you mind re-running the CI?

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

error: package `tokio-util v0.7.12` cannot be built because it requires rustc 1.70 or newer, while the currently active rustc version is 1.63.0

This doesn't seem to be related to my changes from what I can tell... Running cargo msrv even without my changes determines the MSRV to be 1.70.0. Perhaps previous CI jobs have been successful if there's some transitive dependency that's not pinned to a particular version and has been updated since? (Admittedly, I have not yet delved much into cargo dependency conflict resolution, so maybe something else at play of which I'm unaware.)

@seanmonstar How would you like to handle this? Can we bump to rust-version = "1.70.0"?

@seanmonstar
Copy link
Owner

I'll take care of it in #2412

@Jaltaire
Copy link
Contributor Author

Jaltaire commented Sep 9, 2024

@seanmonstar Just rebased off your change. Can you kick off CI again?

@seanmonstar seanmonstar merged commit 09884ed into seanmonstar:master Sep 9, 2024
36 checks passed
@Jaltaire
Copy link
Contributor Author

@seanmonstar, many thanks for helping get this through today.
Can you cut a new release version? I'm eager to use this change once you do. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants