From 6b42cecc064d01d87aae978ecd7eb372bfe9a34e Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 15 Nov 2023 16:12:46 -0700 Subject: feat(ext/net): use rustls_tokio_stream (#21205) Fixes #21121 and #19498 Migrates fully to rustls_tokio_stream. We no longer need to maintain our own TlsStream implementation to properly support duplex. This should fix a number of errors with TLS and websockets, HTTP and "other" places where it's failing. --- runtime/ops/http.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/ops') diff --git a/runtime/ops/http.rs b/runtime/ops/http.rs index f0f0510da..fc66c9fab 100644 --- a/runtime/ops/http.rs +++ b/runtime/ops/http.rs @@ -65,8 +65,8 @@ fn op_http_start( let resource = Rc::try_unwrap(resource_rc) .map_err(|_| bad_resource("TLS stream is currently in use"))?; let (read_half, write_half) = resource.into_inner(); - let tls_stream = read_half.reunite(write_half); - let addr = tls_stream.get_ref().0.local_addr()?; + let tls_stream = read_half.unsplit(write_half); + let addr = tls_stream.local_addr()?; return http_create_conn_resource(state, tls_stream, addr, "https"); } -- cgit v1.2.3