rustdesk/rustdesk-server
1
0 Fork 0
Code Releases 1 Activity

Merge branch 'master' into forapi

Browse Source 
# Conflicts:
#	Cargo.lock
#	libs/hbb_common/protos/rendezvous.proto
#	libs/hbb_common/src/tcp.rs
#	libs/hbb_common~master
This commit is contained in:
lejianwen committed 2025-01-20 22:43:32 +08:00
2 parents 8470471e9c 7a509f6975
commit 45c900a7e6
28 files changed
+1397 -5413
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.toml
+7
View File
@@ -52,6 +52,13 @@ local-ip-address = "0.5.1"
dns-lookup = "1.0.8"
ping = "0.4.0"
[target.'cfg(any(target_os = "macos", target_os = "windows"))'.dependencies]
# https://github.com/rustdesk/rustdesk-server-pro/issues/189, using native-tls for better tls support
reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "native-tls", "gzip"], default-features=false }
[target.'cfg(not(any(target_os = "macos", target_os = "windows")))'.dependencies]
reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "rustls-tls", "rustls-tls-native-roots", "gzip"], default-features=false }
[build-dependencies]
hbb_common = { path = "libs/hbb_common" }