Update Hyper and OpenSSL #15868

nox · 2017-03-08T11:03:35Z

This change is

highfive · 2017-03-08T11:03:38Z

Heads up! This PR modifies the following files:

@asajeffrey: components/webdriver_server/lib.rs, components/webdriver_server/Cargo.toml
@jgraham: components/webdriver_server/lib.rs, components/webdriver_server/Cargo.toml
@fitzgen: components/devtools_traits/Cargo.toml, components/devtools_traits/Cargo.toml, components/devtools/Cargo.toml, components/script/dom/document.rs, components/script/webdriver_handlers.rs, components/script/Cargo.toml, components/script/dom/websocket.rs, components/script_traits/webdriver_msg.rs, components/script_traits/webdriver_msg.rs, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
@KiChjang: components/net/lib.rs, components/script/dom/document.rs, components/net/http_loader.rs, components/net/connector.rs, components/net_traits/lib.rs, components/net_traits/lib.rs, components/script/webdriver_handlers.rs, components/script/Cargo.toml, components/net/cookie_storage.rs, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml, components/net/resource_thread.rs, components/net/Cargo.toml, components/net/cookie.rs, components/net/subresource_integrity.rs, components/script/dom/websocket.rs, components/script_traits/webdriver_msg.rs, components/script_traits/webdriver_msg.rs, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml

nox · 2017-03-08T11:03:41Z

@bors-servo r+ p=17

bors-servo · 2017-03-08T11:03:42Z

📌 Commit 497a7b2 has been approved by nox

bors-servo · 2017-03-08T11:05:58Z

⌛ Testing commit 497a7b2 with merge 788109e...

Update Hyper and OpenSSL  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15868)

bors-servo · 2017-03-08T11:07:02Z

💔 Test failed - windows-msvc-dev

nox · 2017-03-08T11:14:16Z

Build failed, waiting for other jobs to finish...
error: failed to run custom build command for `openssl-sys v0.9.7`
process didn't exit successfully: `c:\buildbot\slave\windows-msvc-dev\build\target\debug\build\openssl-sys-ab551cd13dbf3163\build-script-build` (exit code: 101)
--- stdout
cargo:rustc-link-search=native=C:\Users\Administrator\.servo\msvc-dependencies\openssl\1.0.1t-vs2015\lib64
cargo:include=C:\Users\Administrator\.servo\msvc-dependencies\openssl\1.0.1t-vs2015\include
OPT_LEVEL = Some("0")
TARGET = Some("x86_64-pc-windows-msvc")
HOST = Some("x86_64-pc-windows-msvc")
TARGET = Some("x86_64-pc-windows-msvc")
TARGET = Some("x86_64-pc-windows-msvc")
HOST = Some("x86_64-pc-windows-msvc")
CC_x86_64-pc-windows-msvc = None
CC_x86_64_pc_windows_msvc = None
HOST_CC = None
CC = None
TARGET = Some("x86_64-pc-windows-msvc")
HOST = Some("x86_64-pc-windows-msvc")
CFLAGS_x86_64-pc-windows-msvc = None
CFLAGS_x86_64_pc_windows_msvc = None
HOST_CFLAGS = None
CFLAGS = None
PROFILE = Some("debug")
running: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\BIN\\amd64\\cl.exe" "/nologo" "/MD" "/Z7" "/I" "C:\\Users\\Administrator\\.servo\\msvc-dependencies\\openssl\\1.0.1t-vs2015\\include" "/E" "c:\\buildbot\\slave\\windows-msvc-dev\\build\\target\\debug\\build\\openssl-sys-b989cad2fc000929\\out\\expando.c"
cargo:warning=expando.c
ExitStatus(ExitStatus(0))
cargo:rustc-cfg=osslconf="OPENSSL_NO_KRB5"
cargo:rustc-cfg=osslconf="OPENSSL_NO_RFC3779"
cargo:conf=OPENSSL_NO_KRB5,OPENSSL_NO_RFC3779
cargo:rustc-cfg=ossl101
cargo:version=101

--- stderr
thread 'main' panicked at 'OpenSSL libdir at `C:\Users\Administrator\.servo\msvc-dependencies\openssl\1.0.1t-vs2015\lib64` does not contain the required files to either statically or dynamically link OpenSSL', C:\Users\Administrator\.cargo\registry\src\github.com-1ecc6299db9ec823\openssl-sys-0.9.7\build.rs:355
stack backtrace:
   0:      0x7f6083964c7 - std::panicking::default_hook::{{closure}}
                        at C:\projects\rust\src\libstd\panicking.rs:356
   1:      0x7f6083959f4 - std::panicking::default_hook
                        at C:\projects\rust\src\libstd\panicking.rs:367
   2:      0x7f608399311 - std::panicking::rust_panic_with_hook
                        at C:\projects\rust\src\libstd\panicking.rs:545
   3:      0x7f6083991c8 - std::panicking::begin_panic<collections::string::String>
                        at C:\projects\rust\src\libstd\panicking.rs:507
   4:      0x7f6083990e4 - std::panicking::begin_panic_fmt
                        at C:\projects\rust\src\libstd\panicking.rs:491
   5:      0x7f608316f68 - build_script_build::determine_mode
                        at C:\Users\Administrator\.cargo\registry\src\github.com-1ecc6299db9ec823\openssl-sys-0.9.7\build.rs:355
   6:      0x7f60831468f - build_script_build::main
                        at C:\Users\Administrator\.cargo\registry\src\github.com-1ecc6299db9ec823\openssl-sys-0.9.7\build.rs:76
   7:      0x7f60839bbc1 - panic_unwind::__rust_maybe_catch_panic
                        at C:\projects\rust\src\libpanic_unwind\lib.rs:98
   8:      0x7f60839991a - std::rt::lang_start
                        at C:\projects\rust\src\libstd\rt.rs:51
   9:      0x7f60831725b - main
  10:      0x7f6083a05d8 - __scrt_common_main_seh
                        at f:\dd\vctools\crt\vcstartup\src\startup\exe_common.inl:253
  11:      0x7fd5dab1841 - BaseThreadInitThunk

Cc @sfackler @retep998 @avadacatavra

sfackler · 2017-03-08T11:22:56Z

What is in C:\Users\Administrator\.servo\msvc-dependencies\openssl\1.0.1t-vs2015\lib64?

nox · 2017-03-08T11:31:35Z

Absolutely no idea.

Cc @edunham @larsbergstrom.

Ms2ger · 2017-03-08T11:26:34Z

tests/unit/net/fetch.rs

@@ -18,10 +18,11 @@ use hyper::header::{Encoding, Location, Pragma, Quality, QualityItem, SetCookie,
 use hyper::header::{Headers, Host, HttpDate, Referer as HyperReferer};
 use hyper::method::Method;
 use hyper::mime::{Mime, SubLevel, TopLevel};
-use hyper::net::Openssl;
+//use hyper::net::Openssl;


Ms2ger · 2017-03-08T11:27:15Z

components/net/resource_thread.rs

-                          resource_group: &ResourceGroup) {
-        if let Some(cookie) = cookie::Cookie::new_wrapped(cookie, &request, source) {
+    fn set_cookie_for_url(&mut self, request: &ServoUrl,
+                           cookie: cookie_rs::Cookie<'static>,


Ms2ger · 2017-03-08T11:28:24Z

components/net/http_loader.rs

@@ -126,42 +125,62 @@ struct NetworkHttpRequestFactory {

 impl NetworkHttpRequestFactory {
    fn create(&self, url: ServoUrl, method: Method, headers: Headers)
-              -> Result<HyperRequest<Fresh>, NetworkError> {
+              -> Result<HyperRequest<Fresh>, LoadError> {
        let connection = HyperRequest::with_connector(method,
                                                      url.clone().into_url().unwrap(),
                                                      &*self.connector);

        if let Err(HttpError::Ssl(ref error)) = connection {
            let error: &(Error + Send + 'static) = &**error;


Still necessary?

Ms2ger · 2017-03-08T11:30:04Z

components/net/http_loader.rs

+}
+
+#[derive(Debug)]
+struct LoadError {


I removed this in 87979ef; any reason for it to return?

Ms2ger · 2017-03-08T11:32:10Z

@bors-servo r-

nox · 2017-03-08T11:32:37Z

Ugh, I'll never use Reviewable again.

nox · 2017-03-08T11:45:55Z

@Ms2ger Addressed your remarks.

Ms2ger · 2017-03-08T11:58:01Z

Thanks, fine for me.

Manishearth · 2017-03-08T22:17:48Z

@bors-servo treeclosed-

bors-servo · 2017-03-09T02:59:59Z

☔ The latest upstream changes (presumably #15844) made this pull request unmergeable. Please resolve the merge conflicts.

nox · 2017-03-31T14:32:50Z

r? @jdm

nox · 2017-03-31T14:50:38Z

@bors-servo try

bors-servo · 2017-03-31T14:50:42Z

⌛ Trying commit e527c9a with merge adee7e5...

Update Hyper and OpenSSL  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15868)

jdm · 2017-03-31T14:51:16Z

@bors-servo: r+

bors-servo · 2017-03-31T14:51:17Z

📌 Commit e527c9a has been approved by jdm

nox · 2017-03-31T14:52:14Z

@bors-servo try- retry

bors-servo · 2017-03-31T15:22:38Z

⌛ Testing commit e527c9a with merge 5c3e549...

Update Hyper and OpenSSL  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15868)

bors-servo · 2017-03-31T15:43:34Z

💔 Test failed - linux-rel-wpt

nox · 2017-03-31T16:09:04Z

@bors-servo retry #14323

bors-servo · 2017-03-31T16:46:10Z

⌛ Testing commit e527c9a with merge 82b0d5a...

Update Hyper and OpenSSL  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15868)

bors-servo · 2017-03-31T17:29:21Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: jdm
Pushing 82b0d5a to master...

highfive assigned metajack Mar 8, 2017

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 8, 2017

highfive assigned nox and unassigned metajack Mar 8, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 8, 2017

nox mentioned this pull request Mar 8, 2017

bumped hyper to 0.10, cookie to 0.6, webdriver to 0.22, added dependency on hyper-openssl #15775

Closed

5 tasks

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 8, 2017

Ms2ger reviewed Mar 8, 2017

View reviewed changes

nox force-pushed the hyper branch from 497a7b2 to feac84c Compare March 8, 2017 11:36

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Mar 8, 2017

nox force-pushed the hyper branch from feac84c to 6fd06b3 Compare March 8, 2017 11:45

nox removed the S-awaiting-review There is new code that needs to be reviewed. label Mar 8, 2017

Update Hyper and OpenSSL

e527c9a

nox force-pushed the hyper branch from b3c033f to e527c9a Compare March 31, 2017 14:32

highfive removed the S-tests-failed The changes caused existing tests to fail. label Mar 31, 2017

highfive assigned jdm and unassigned nox Mar 31, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Mar 31, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 31, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Mar 31, 2017

bors-servo merged commit e527c9a into master Mar 31, 2017

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 31, 2017

bors-servo mentioned this pull request Mar 31, 2017

Update WR (various optimizations, gradient improvements). #16200

Merged

SimonSapin deleted the hyper branch April 26, 2017 03:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Hyper and OpenSSL #15868

Update Hyper and OpenSSL #15868

nox commented Mar 8, 2017 •

edited by larsbergstrom

highfive commented Mar 8, 2017

nox commented Mar 8, 2017

bors-servo commented Mar 8, 2017

bors-servo commented Mar 8, 2017

bors-servo commented Mar 8, 2017

nox commented Mar 8, 2017

sfackler commented Mar 8, 2017 •

edited by nox

nox commented Mar 8, 2017

Ms2ger Mar 8, 2017

Ms2ger Mar 8, 2017

Ms2ger Mar 8, 2017

Ms2ger Mar 8, 2017

Ms2ger commented Mar 8, 2017

nox commented Mar 8, 2017

nox commented Mar 8, 2017

Ms2ger commented Mar 8, 2017

Manishearth commented Mar 8, 2017

bors-servo commented Mar 9, 2017

nox commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

jdm commented Mar 31, 2017

bors-servo commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

bors-servo commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

bors-servo commented Mar 31, 2017

Update Hyper and OpenSSL #15868

Update Hyper and OpenSSL #15868

Conversation

nox commented Mar 8, 2017 • edited by larsbergstrom

highfive commented Mar 8, 2017

nox commented Mar 8, 2017

bors-servo commented Mar 8, 2017

bors-servo commented Mar 8, 2017

bors-servo commented Mar 8, 2017

nox commented Mar 8, 2017

sfackler commented Mar 8, 2017 • edited by nox

nox commented Mar 8, 2017

Ms2ger Mar 8, 2017

Choose a reason for hiding this comment

Ms2ger Mar 8, 2017

Choose a reason for hiding this comment

Ms2ger Mar 8, 2017

Choose a reason for hiding this comment

Ms2ger Mar 8, 2017

Choose a reason for hiding this comment

Ms2ger commented Mar 8, 2017

nox commented Mar 8, 2017

nox commented Mar 8, 2017

Ms2ger commented Mar 8, 2017

Manishearth commented Mar 8, 2017

bors-servo commented Mar 9, 2017

nox commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

jdm commented Mar 31, 2017

bors-servo commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

bors-servo commented Mar 31, 2017

nox commented Mar 31, 2017

bors-servo commented Mar 31, 2017

bors-servo commented Mar 31, 2017

nox commented Mar 8, 2017 •

edited by larsbergstrom

sfackler commented Mar 8, 2017 •

edited by nox