aboutsummaryrefslogtreecommitdiffstats
path: root/components/net
diff options
context:
space:
mode:
Diffstat (limited to 'components/net')
-rw-r--r--components/net/http_loader.rs16
-rw-r--r--components/net/tests/http_loader.rs8
2 files changed, 13 insertions, 11 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index e0867b8d07f..704901f6940 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -37,7 +37,7 @@ use hyper::ext::ReasonPhrase;
use hyper::header::{HeaderName, TRANSFER_ENCODING};
use hyper_serde::Serde;
use hyper_util::client::legacy::Client;
-use ipc_channel::ipc::{self, IpcSender};
+use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
use ipc_channel::router::ROUTER;
use log::{debug, error, info, log_enabled, warn};
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
@@ -462,7 +462,7 @@ fn auth_from_cache(
/// used to fill the body with bytes coming-in over IPC.
enum BodyChunk {
/// A chunk of bytes.
- Chunk(Vec<u8>),
+ Chunk(IpcSharedMemory),
/// Body is done.
Done,
}
@@ -489,12 +489,14 @@ enum BodySink {
}
impl BodySink {
- fn transmit_bytes(&self, bytes: Vec<u8>) {
+ fn transmit_bytes(&self, bytes: IpcSharedMemory) {
match self {
BodySink::Chunked(sender) => {
let sender = sender.clone();
HANDLE.spawn(async move {
- let _ = sender.send(Ok(Frame::data(bytes.into()))).await;
+ let _ = sender
+ .send(Ok(Frame::data(Bytes::copy_from_slice(&bytes))))
+ .await;
});
},
BodySink::Buffered(sender) => {
@@ -577,7 +579,7 @@ async fn obtain_response(
body_port,
Box::new(move |message| {
info!("Received message");
- let bytes: Vec<u8> = match message.unwrap() {
+ let bytes = match message.unwrap() {
BodyChunkResponse::Chunk(bytes) => bytes,
BodyChunkResponse::Done => {
// Step 3, abort these parallel steps.
@@ -622,8 +624,8 @@ async fn obtain_response(
let mut body = vec![];
loop {
match receiver.recv().await {
- Some(BodyChunk::Chunk(mut bytes)) => {
- body.append(&mut bytes);
+ Some(BodyChunk::Chunk(bytes)) => {
+ body.extend_from_slice(&bytes);
},
Some(BodyChunk::Done) => break,
None => warn!("Failed to read all chunks from request body."),
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index 1fc2d1b662d..b1e90276472 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -31,7 +31,7 @@ use http::{HeaderName, Method, StatusCode};
use http_body_util::combinators::BoxBody;
use hyper::body::{Body, Bytes, Incoming};
use hyper::{Request as HyperRequest, Response as HyperResponse};
-use ipc_channel::ipc;
+use ipc_channel::ipc::{self, IpcSharedMemory};
use ipc_channel::router::ROUTER;
use net::cookie::ServoCookie;
use net::cookie_storage::CookieStorage;
@@ -100,7 +100,7 @@ pub fn expect_devtools_http_response(
}
}
-fn create_request_body_with_content(content: Vec<u8>) -> RequestBody {
+fn create_request_body_with_content(content: IpcSharedMemory) -> RequestBody {
let content_len = content.len();
let (chunk_request_sender, chunk_request_receiver) = ipc::channel().unwrap();
@@ -592,7 +592,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
let (pre_server, pre_url) = make_server(pre_handler);
let content = b"Body on POST!";
- let request_body = create_request_body_with_content(content.to_vec());
+ let request_body = create_request_body_with_content(IpcSharedMemory::from_bytes(content));
let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
.body(Some(request_body))
@@ -904,7 +904,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
};
let (server, url) = make_server(handler);
- let request_body = create_request_body_with_content(content.to_vec());
+ let request_body = create_request_body_with_content(IpcSharedMemory::from_bytes(content));
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.method(Method::POST)