Skip to content

Commit

Permalink
Merge pull request blackbeam#246 from blackbeam/issue-244
Browse files Browse the repository at this point in the history
Use rust flate2 backend on default-rustls feature (see blackbeam#244)
  • Loading branch information
blackbeam authored Apr 22, 2023
2 parents 5843e91 + 485c7b7 commit 55fff99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ default = [
"native-tls-tls",
]
default-rustls = [
"flate2/zlib",
"flate2/rust_backend",
"mysql_common/bigdecimal",
"mysql_common/rust_decimal",
"mysql_common/time",
Expand Down
2 changes: 1 addition & 1 deletion src/conn/pool/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ mod test {
.collect::<Vec<_>>();

// give some time to reset connections
sleep(Duration::from_millis(500)).await;
sleep(Duration::from_millis(1000)).await;

// get_conn should work if connection is available and alive
pool.get_conn().await?;
Expand Down

0 comments on commit 55fff99

Please sign in to comment.