diff options
author | Matt Mastracci <matthew@mastracci.com> | 2023-08-23 17:03:05 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-23 17:03:05 -0600 |
commit | b1ce2e41676ab5bc807a705b072986d9357fece5 (patch) | |
tree | 18d9b7796221d6236c9e993602c56c769345b6ce /ext | |
parent | af1b794e53182dfe19cc675a107138263f08476c (diff) |
fix(ext/web): add stream tests to detect v8slice split bug (#20253)
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Diffstat (limited to 'ext')
-rw-r--r-- | ext/cache/sqlite.rs | 2 | ||||
-rw-r--r-- | ext/crypto/decrypt.rs | 2 | ||||
-rw-r--r-- | ext/crypto/encrypt.rs | 2 | ||||
-rw-r--r-- | ext/crypto/generate_key.rs | 2 | ||||
-rw-r--r-- | ext/crypto/lib.rs | 2 | ||||
-rw-r--r-- | ext/fetch/lib.rs | 2 | ||||
-rw-r--r-- | ext/ffi/call.rs | 2 | ||||
-rw-r--r-- | ext/fs/std_fs.rs | 2 | ||||
-rw-r--r-- | ext/http/http_next.rs | 4 | ||||
-rw-r--r-- | ext/http/lib.rs | 6 | ||||
-rw-r--r-- | ext/io/lib.rs | 2 | ||||
-rw-r--r-- | ext/kv/remote.rs | 4 | ||||
-rw-r--r-- | ext/kv/sqlite.rs | 6 | ||||
-rw-r--r-- | ext/net/ops_tls.rs | 2 | ||||
-rw-r--r-- | ext/node/ops/crypto/mod.rs | 2 | ||||
-rw-r--r-- | ext/websocket/lib.rs | 6 |
16 files changed, 24 insertions, 24 deletions
diff --git a/ext/cache/sqlite.rs b/ext/cache/sqlite.rs index 8589d61fd..883f8cc19 100644 --- a/ext/cache/sqlite.rs +++ b/ext/cache/sqlite.rs @@ -10,7 +10,7 @@ use std::time::UNIX_EPOCH; use async_trait::async_trait; use deno_core::error::AnyError; use deno_core::parking_lot::Mutex; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::AsyncRefCell; use deno_core::AsyncResult; use deno_core::ByteString; diff --git a/ext/crypto/decrypt.rs b/ext/crypto/decrypt.rs index 59679614f..07b2e3e67 100644 --- a/ext/crypto/decrypt.rs +++ b/ext/crypto/decrypt.rs @@ -20,7 +20,7 @@ use deno_core::error::custom_error; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::op; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::JsBuffer; use deno_core::ToJsBuffer; use rsa::pkcs1::DecodeRsaPrivateKey; diff --git a/ext/crypto/encrypt.rs b/ext/crypto/encrypt.rs index 0dc300538..b4a38edde 100644 --- a/ext/crypto/encrypt.rs +++ b/ext/crypto/encrypt.rs @@ -19,7 +19,7 @@ use ctr::Ctr64BE; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::op; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::JsBuffer; use deno_core::ToJsBuffer; use rand::rngs::OsRng; diff --git a/ext/crypto/generate_key.rs b/ext/crypto/generate_key.rs index 9e2d14ea7..6aae2a9b3 100644 --- a/ext/crypto/generate_key.rs +++ b/ext/crypto/generate_key.rs @@ -2,7 +2,7 @@ use deno_core::error::AnyError; use deno_core::op; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::ToJsBuffer; use elliptic_curve::rand_core::OsRng; use num_traits::FromPrimitive; diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs index 1765697c6..a0a3a2a25 100644 --- a/ext/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -11,7 +11,7 @@ use deno_core::error::AnyError; use deno_core::op; use deno_core::ToJsBuffer; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::JsBuffer; use deno_core::OpState; use serde::Deserialize; diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index dd83f19ee..4485a3dbe 100644 --- a/ext/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -24,7 +24,7 @@ use deno_core::op; use deno_core::BufView; use deno_core::WriteOutcome; -use deno_core::task::spawn; +use deno_core::unsync::spawn; use deno_core::url::Url; use deno_core::AsyncRefCell; use deno_core::AsyncResult; diff --git a/ext/ffi/call.rs b/ext/ffi/call.rs index 82f8dd822..4f9bbe3bb 100644 --- a/ext/ffi/call.rs +++ b/ext/ffi/call.rs @@ -15,7 +15,7 @@ use deno_core::op; use deno_core::serde_json::Value; use deno_core::serde_v8; use deno_core::serde_v8::ExternalPointer; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::v8; use deno_core::OpState; use deno_core::ResourceId; diff --git a/ext/fs/std_fs.rs b/ext/fs/std_fs.rs index b2923abb1..9aa46613c 100644 --- a/ext/fs/std_fs.rs +++ b/ext/fs/std_fs.rs @@ -9,7 +9,7 @@ use std::path::Path; use std::path::PathBuf; use std::rc::Rc; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_io::fs::File; use deno_io::fs::FsResult; use deno_io::fs::FsStat; diff --git a/ext/http/http_next.rs b/ext/http/http_next.rs index 17e9befe2..4d5c63776 100644 --- a/ext/http/http_next.rs +++ b/ext/http/http_next.rs @@ -25,8 +25,8 @@ use deno_core::op; use deno_core::op2; use deno_core::serde_v8; use deno_core::serde_v8::from_v8; -use deno_core::task::spawn; -use deno_core::task::JoinHandle; +use deno_core::unsync::spawn; +use deno_core::unsync::JoinHandle; use deno_core::v8; use deno_core::AsyncRefCell; use deno_core::AsyncResult; diff --git a/ext/http/lib.rs b/ext/http/lib.rs index e0c5c89d0..93ea0895e 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -21,7 +21,7 @@ use deno_core::futures::FutureExt; use deno_core::futures::StreamExt; use deno_core::futures::TryFutureExt; use deno_core::op; -use deno_core::task::spawn; +use deno_core::unsync::spawn; use deno_core::AsyncRefCell; use deno_core::AsyncResult; use deno_core::BufView; @@ -1021,7 +1021,7 @@ where Fut::Output: 'static, { fn execute(&self, fut: Fut) { - deno_core::task::spawn(fut); + deno_core::unsync::spawn(fut); } } @@ -1031,7 +1031,7 @@ where Fut::Output: 'static, { fn execute(&self, fut: Fut) { - deno_core::task::spawn(fut); + deno_core::unsync::spawn(fut); } } diff --git a/ext/io/lib.rs b/ext/io/lib.rs index 090622231..3d6ac0f37 100644 --- a/ext/io/lib.rs +++ b/ext/io/lib.rs @@ -2,7 +2,7 @@ use deno_core::error::AnyError; use deno_core::op; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::AsyncMutFuture; use deno_core::AsyncRefCell; use deno_core::AsyncResult; diff --git a/ext/kv/remote.rs b/ext/kv/remote.rs index 47528d15f..448a87b0d 100644 --- a/ext/kv/remote.rs +++ b/ext/kv/remote.rs @@ -24,7 +24,7 @@ use chrono::Utc; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::futures::TryFutureExt; -use deno_core::task::JoinHandle; +use deno_core::unsync::JoinHandle; use deno_core::OpState; use prost::Message; use rand::Rng; @@ -357,7 +357,7 @@ impl MetadataRefresher { pub fn new(url: String, access_token: String) -> Self { let (tx, rx) = watch::channel(MetadataState::Pending); let handle = - deno_core::task::spawn(metadata_refresh_task(url, access_token, tx)); + deno_core::unsync::spawn(metadata_refresh_task(url, access_token, tx)); Self { handle, metadata_rx: rx, diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index bf2688920..f67154cb4 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -19,8 +19,8 @@ use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::futures; use deno_core::futures::FutureExt; -use deno_core::task::spawn; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn; +use deno_core::unsync::spawn_blocking; use deno_core::AsyncRefCell; use deno_core::OpState; use rand::Rng; @@ -285,7 +285,7 @@ impl<P: SqliteDbHandlerPermissions> DatabaseHandler for SqliteDbHandler<P> { pub struct SqliteDb { conn: ProtectedConn, queue: OnceCell<SqliteQueue>, - expiration_watcher: deno_core::task::JoinHandle<()>, + expiration_watcher: deno_core::unsync::JoinHandle<()>, } impl Drop for SqliteDb { diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index 7b1cb4e0a..c2ca3d358 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -26,7 +26,7 @@ use deno_core::futures::task::Waker; use deno_core::op; use deno_core::parking_lot::Mutex; -use deno_core::task::spawn; +use deno_core::unsync::spawn; use deno_core::AsyncRefCell; use deno_core::AsyncResult; use deno_core::ByteString; diff --git a/ext/node/ops/crypto/mod.rs b/ext/node/ops/crypto/mod.rs index 1155a4d15..c0b4f55f8 100644 --- a/ext/node/ops/crypto/mod.rs +++ b/ext/node/ops/crypto/mod.rs @@ -4,7 +4,7 @@ use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::op; use deno_core::serde_v8; -use deno_core::task::spawn_blocking; +use deno_core::unsync::spawn_blocking; use deno_core::JsBuffer; use deno_core::OpState; use deno_core::ResourceId; diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index 81f358dd2..bdca1433b 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -412,7 +412,7 @@ pub fn op_ws_send_binary(state: &mut OpState, rid: ResourceId, data: &[u8]) { let len = data.len(); resource.buffered.set(resource.buffered.get() + len); let lock = resource.reserve_lock(); - deno_core::task::spawn(async move { + deno_core::unsync::spawn(async move { if let Err(err) = resource .write_frame(lock, Frame::new(true, OpCode::Binary, None, data.into())) .await @@ -430,7 +430,7 @@ pub fn op_ws_send_text(state: &mut OpState, rid: ResourceId, data: String) { let len = data.len(); resource.buffered.set(resource.buffered.get() + len); let lock = resource.reserve_lock(); - deno_core::task::spawn(async move { + deno_core::unsync::spawn(async move { if let Err(err) = resource .write_frame( lock, @@ -719,6 +719,6 @@ where Fut::Output: 'static, { fn execute(&self, fut: Fut) { - deno_core::task::spawn(fut); + deno_core::unsync::spawn(fut); } } |