diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-03-31 20:19:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-31 20:19:50 +0200 |
| commit | 7c68623580342940d7cd53bc8bce1926841feb47 (patch) | |
| tree | 9dc84cebbe7a64f4486cc2dc492080903f7a7bcf /zellij-utils | |
| parent | Preserve scrollback for partial scroll regions starting at top (#4941) (diff) | |
| download | sl0ppij-7c68623580342940d7cd53bc8bce1926841feb47.tar.gz sl0ppij-7c68623580342940d7cd53bc8bce1926841feb47.tar.xz sl0ppij-7c68623580342940d7cd53bc8bce1926841feb47.zip | |
Move from native-tls to rustls in the remote client (mirrors the web server) (#4972)
* native-tls -> rustls
* add/update tests
* rustfmt
* add pr
Diffstat (limited to 'zellij-utils')
| -rw-r--r-- | zellij-utils/src/remote_session_tokens.rs | 1 | ||||
| -rw-r--r-- | zellij-utils/src/web_authentication_tokens.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/zellij-utils/src/remote_session_tokens.rs b/zellij-utils/src/remote_session_tokens.rs index ef891c53..b0a323ee 100644 --- a/zellij-utils/src/remote_session_tokens.rs +++ b/zellij-utils/src/remote_session_tokens.rs @@ -44,6 +44,7 @@ fn get_db_path() -> Result<PathBuf> { } fn init_db(conn: &Connection) -> Result<()> { + conn.execute_batch("PRAGMA busy_timeout = 5000")?; conn.execute( "CREATE TABLE IF NOT EXISTS remote_sessions ( id INTEGER PRIMARY KEY AUTOINCREMENT, diff --git a/zellij-utils/src/web_authentication_tokens.rs b/zellij-utils/src/web_authentication_tokens.rs index 0102be19..b579890f 100644 --- a/zellij-utils/src/web_authentication_tokens.rs +++ b/zellij-utils/src/web_authentication_tokens.rs @@ -89,6 +89,7 @@ fn open_db() -> Result<Connection> { } fn init_db(conn: &Connection) -> Result<()> { + conn.execute_batch("PRAGMA busy_timeout = 5000")?; conn.execute_batch("PRAGMA foreign_keys = ON")?; conn.execute( |