nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 16:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

move keep-alive fix to only close connections where an error occurs

Browse Source
This commit is contained in:
Lennart
2024-03-16 00:05:51 +01:00
parent af870c305b
commit 55342309b9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/auth/src/error.rs
View File

@@ -26,6 +26,8 @@ impl actix_web::error::ResponseError for Error {
match self { match self {
Error::Unauthorized => HttpResponse::build(self.status_code()) Error::Unauthorized => HttpResponse::build(self.status_code())
.append_header(("WWW-Authenticate", "Basic")) .append_header(("WWW-Authenticate", "Basic"))
// This is an unfortunate workaround for https://github.com/actix/actix-web/issues/1805
.force_close()
.body(self.to_string()), .body(self.to_string()),
_ => HttpResponse::build(self.status_code()).body(self.to_string()), _ => HttpResponse::build(self.status_code()).body(self.to_string()),
} }

3
src/main.rs
View File

@@ -1,5 +1,4 @@
use crate::config::Config; use crate::config::Config;
use actix_web::http::KeepAlive;
use actix_web::HttpServer; use actix_web::HttpServer;
use anyhow::Result; use anyhow::Result;
use app::make_app; use app::make_app;
@@ -57,8 +56,6 @@ async fn main() -> Result<()> {
HttpServer::new(move || make_app(cal_store.clone(), auth.clone())) HttpServer::new(move || make_app(cal_store.clone(), auth.clone()))
.bind((config.http.host, config.http.port))? .bind((config.http.host, config.http.port))?
// This is an unfortunate workaround for https://github.com/actix/actix-web/issues/1805
.keep_alive(KeepAlive::Disabled)
.run() .run()
.await?; .await?;