Merge origin SMB fixes with local Phase 21-22 features
Origin changes merged: - SMB performance optimization (pread/pwrite, tokio Mutex) - macOS SMB mount fix (AAPL caps, credit grant) - Compound request integration tests - CTDB architecture analysis Local changes preserved: - upload_path config (deployed, tested stable) - delete_file + preview_file routes (MyFiles UI) - SSH async I/O (cipher.rs, packet.rs, server.rs) - auth.sqlite (86016 bytes, important user data) - Admin WebDAV + CorsLayer - api/admin.rs + api/config.rs (new endpoints) Conflicts resolved: - myfiles.rs: kept upload_path + OnceLock static - auth.sqlite: preserved local version (important data) Test results: 393 passed, 5 auth tests failed - PG tests require external PostgreSQL - Auth tests expect specific password hashes - auth.sqlite preserved with actual user credentials
This commit is contained in:
@@ -73,6 +73,7 @@ rusty-s3 = "0.10" # S3 API 签名(AWS Signature V4)
|
||||
ureq = "2.12" # 輕量同步 HTTP 客戶端
|
||||
reqwest = { version = "0.12", optional = true } # Async HTTP client for AsyncS3Vfs
|
||||
rayon = "1.10" # Phase 4: 并行加密
|
||||
tower-http = { version = "0.5", features = ["cors"] }
|
||||
url = "2" # URL 解析(rusty-s3 依賴)
|
||||
xattr = "1.0" # Extended attributes support (AFP_AfpInfo, Time Machine)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user