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

Bring back hyper with proxy support #532

Merged
merged 4 commits into from
Jun 20, 2016
Merged

Conversation

inejge
Copy link
Contributor

@inejge inejge commented Jun 14, 2016

Reintegrate hyper support and make it selectable at runtime by setting the environment. Add proxy support to downloads handled by hyper (also activated by setting the environment.)

Fixes #509

Restore support for hyper + rust-native-tls, selectable at runtime by
setting RUSTUP_USE_HYPER in the environment. Proxied connections are
supported as well.

Fixes rust-lang#509
- Harmonize winapi with native-tls/schannel: add override.

- Incorporate a fix for schannel which adds a Send bound to CertStore
  (sfackler/schannel-rs#10).
@inejge inejge mentioned this pull request Jun 16, 2016
@brson
Copy link
Contributor

brson commented Jun 17, 2016

I retried just to see what happens.

@alexcrichton
Copy link
Member

I believe the CI error means that Cargo.lock may not be up to date and the CI builders are trying to modify the readonly copy. Perhaps a cargo build locally and being sure to check in that updated Cargo.lock would work?

Update Cargo.lock so that CI builders don't try to modify it, as
it is read-only during the build.

Fixes rust-lang#509
@inejge
Copy link
Contributor Author

inejge commented Jun 17, 2016

I believe the CI error means that Cargo.lock may not be up to date and the CI builders are trying to modify the readonly copy.

Exactly right. Travis builds are now passing, thanks and sorry for the noise.

@brson brson merged commit 090f9c8 into rust-lang:master Jun 20, 2016
@brson
Copy link
Contributor

brson commented Jun 20, 2016

Thanks @inejge!

@inejge inejge deleted the re-hyper branch July 11, 2016 12:15
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.

None yet

3 participants