Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4478 : jdm/servo/hyperssl, r=larsbergstrom

Browse source 
This just updates rust-openssl and hyper to use cherry-picked commits that fix this particular issue. I think it's worth it because the experience of trying Servo for the first time right now is pretty terrible.
This commit is contained in:
bors-servo 2014-12-24 11:15:45 -07:00
commit 070008b4c4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/servo/Cargo.lock generated
View file

@ -388,7 +388,7 @@ source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6b
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#9c70c58e65ec80446fdb6e338f1060589b562f8c"
source = "git+https://github.com/servo/hyper?ref=servo#4a2c82c75013f8ee55d2017876319b48d656dcb3"
dependencies = [
"cookie 0.0.1 (git+https://github.com/servo/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
@ -522,7 +522,7 @@ dependencies = [
[[package]]
name = "openssl"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.0.2 (git+https://github.com/servo/rust-openssl)",
@ -531,7 +531,7 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"pkg-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]

6
ports/cef/Cargo.lock generated
View file

@ -356,7 +356,7 @@ source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6b
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#9c70c58e65ec80446fdb6e338f1060589b562f8c"
source = "git+https://github.com/servo/hyper?ref=servo#4a2c82c75013f8ee55d2017876319b48d656dcb3"
dependencies = [
"cookie 0.0.1 (git+https://github.com/servo/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
@ -490,7 +490,7 @@ dependencies = [
[[package]]
name = "openssl"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.0.2 (git+https://github.com/servo/rust-openssl)",
@ -499,7 +499,7 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"pkg-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]

6
ports/gonk/Cargo.lock generated
View file

@ -310,7 +310,7 @@ source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6b
[[package]]
name = "hyper"
version = "0.0.1"
source = "git+https://github.com/servo/hyper?ref=servo#9c70c58e65ec80446fdb6e338f1060589b562f8c"
source = "git+https://github.com/servo/hyper?ref=servo#4a2c82c75013f8ee55d2017876319b48d656dcb3"
dependencies = [
"cookie 0.0.1 (git+https://github.com/servo/cookie-rs)",
"mime 0.0.1 (git+https://github.com/hyperium/mime.rs)",
@ -444,7 +444,7 @@ dependencies = [
[[package]]
name = "openssl"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.0.2 (git+https://github.com/servo/rust-openssl)",
@ -453,7 +453,7 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.0.2"
source = "git+https://github.com/servo/rust-openssl#19d9b53a86d602e16ab2274813a517cfaa4a2512"
source = "git+https://github.com/servo/rust-openssl#aed5df1036d6f4b5f7b8be6457d10f8a0379b39f"
dependencies = [
"pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]