Merge pull request #532 from inejge/re-hyper

Bring back hyper with proxy support

Cargo.toml

@@ -55,3 +55,6 @@ test = false # no unit tests
 name = "rustup-init"
 path = "src/rustup-cli/main.rs"
 test = false # no unit tests
+
+[replace]
+"winapi:0.2.7" = { git = "https://github.com/sfackler/winapi-rs" }

src/rustup-dist/Cargo.toml

@@ -39,3 +39,6 @@ libc = "0.2.0"
 
 [lib]
 name = "rustup_dist"
+
+[replace]
+"winapi:0.2.7" = { git = "https://github.com/sfackler/winapi-rs" }

src/rustup-mock/Cargo.toml

@@ -25,3 +25,6 @@ sha2 = "0.1.2"
 [target."cfg(windows)".dependencies]
 winapi = "0.2.4"
 winreg = "0.3.2"
+
+[replace]
+"winapi:0.2.7" = { git = "https://github.com/sfackler/winapi-rs" }

src/rustup-utils/Cargo.toml

@@ -21,6 +21,14 @@ sha2 = "0.1.2"
 curl = "0.3"
 url = "1.1"
 toml = "0.1.27"
+native-tls = { git = "https://github.com/sfackler/rust-native-tls.git" }
+
+[target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.dependencies]
+openssl-sys = "0.7.11"
+
+[dependencies.hyper]
+version = "0.9.8"
+default-features = false
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.4"
@@ -30,3 +38,6 @@ ole32-sys = "0.2.0"
 kernel32-sys = "0.2.1"
 advapi32-sys = "0.2.0"
 userenv-sys = "0.2.0"
+
+[replace]
+"winapi:0.2.7" = { git = "https://github.com/sfackler/winapi-rs" }

src/rustup-utils/src/lib.rs

@@ -9,6 +9,10 @@ extern crate rustc_serialize;
 extern crate sha2;
 extern crate url;
 extern crate toml;
+extern crate hyper;
+extern crate native_tls;
+#[cfg(not(any(target_os = "windows", target_os = "macos")))]
+extern crate openssl_sys;
 
 #[cfg(windows)]
 extern crate winapi;