Close connection on 5xx error.

Author: mleonhard

Readme.md

@@ -143,6 +143,7 @@ Functions  Expressions  Impls  Traits  Methods  Dependency
 0/0        14/14        1/1    0/0     0/0      ☢️  │   │   └── tracing 0.1.40
 0/0        11/191       0/0    0/0     2/2      ☢️  │   │       ├── pin-project-lite 0.2.14
 0/0        96/96        5/5    0/0     2/2      ☢️  │   │       └── tracing-core 0.1.32
+0/0        0/117        0/9    0/0     0/4      ❓  │   │           └── once_cell 1.20.2
 0/0        0/0          0/0    0/0     0/0      ❓  │   └── futures-lite 2.3.0
 0/0        0/0          0/0    0/0     0/0      🔒  ├── async-net 2.0.0
 0/0        68/114       19/22  1/1     4/8      ☢️  │   ├── async-io 2.3.4
@@ -226,16 +227,17 @@ Functions  Expressions  Impls  Traits  Methods  Dependency
 0/0        8/8          0/0    0/0     0/0      ☢️      ├── percent-encoding 2.3.1
 0/0        5/5          0/0    0/0     0/0      ☢️      └── serde 1.0.210
 
-101/547    7066/13878   105/144 3/6     187/322
+101/547    7066/13995   105/153 3/6     187/326
 
 ```
 # Alternatives
 See [rust-webserver-comparison.md](https://github.com/mleonhard/servlin/blob/main/rust-webserver-comparison.md).
 
 # Changelog
 - v0.7.0 2024-11-06
-   - `log_request_and_response` to log duration_ms tag.
+   - `log_request_and_response` to log `duration_ms` tag.
    - Fix typo in function name `Response::internal_server_errror_500`.
+   - Close connection on 5xx error.
 - v0.6.1 2024-11-03 - Implement `Into<TagList>` for arrays.
 - v0.6.0 2024-11-02
    - Remove `servlin::reexports` module.

src/http_conn.rs

@@ -56,7 +56,7 @@ impl HttpConn {
 
     #[must_use]
     pub fn is_ready(&self) -> bool {
-        self.read_state == ReadState::Head
+        self.read_state == ReadState::Head && self.write_state == WriteState::None
     }
 
     pub fn shutdown_write(&mut self) {
@@ -243,11 +243,15 @@ impl HttpConn {
             WriteState::Shutdown => return Err(HttpError::Disconnected),
         }
         let mut write_counter = AsyncWriteCounter::new(&mut self.stream);
-        let result = write_http_response(&mut write_counter, response).await;
+        let close = (500..=599).contains(&response.code);
+        let result = write_http_response(&mut write_counter, response, close).await;
         if result.is_ok() {
             if !response.is_1xx() {
                 self.write_state = WriteState::None;
             }
+            if close {
+                self.shutdown_write();
+            }
         } else if write_counter.num_bytes_written() > 0 {
             self.shutdown_write();
         }

src/lib.rs

@@ -102,8 +102,9 @@
 //!
 //! # Changelog
 //! - v0.7.0 2024-11-06
-//!    - `log_request_and_response` to log duration_ms tag.
+//!    - `log_request_and_response` to log `duration_ms` tag.
 //!    - Fix typo in function name `Response::internal_server_errror_500`.
+//!    - Close connection on 5xx error.
 //! - v0.6.1 2024-11-03 - Implement `Into<TagList>` for arrays.
 //! - v0.6.0 2024-11-02
 //!    - Remove `servlin::reexports` module.

src/log/mod.rs

@@ -140,6 +140,5 @@ pub fn log_request_and_response<F: FnOnce(Request) -> Result<Response, Error>>(
     add_thread_local_log_tags_from_request(&req);
     let handler_result = f(req);
     add_thread_local_log_tag("duration_ms", before.elapsed().as_millis());
-    let log_result = log_response(handler_result);
-    log_result
+    log_response(handler_result)
 }

src/response.rs

@@ -468,6 +468,7 @@ pub fn reason_phrase(code: u16) -> &'static str {
 pub async fn write_http_response(
     mut writer: impl AsyncWrite + Unpin,
     response: &Response,
+    close: bool,
 ) -> Result<(), HttpError> {
     //dbg!("write_http_response", &response);
     if !response.is_normal() {
@@ -494,6 +495,9 @@ pub async fn write_http_response(
         )
         .unwrap();
     }
+    if close {
+        write!(head_bytes, "connection: close\r\n",).unwrap();
+    }
     if let Some(body_len) = response.body.len() {
         if response.headers.get_only("content-length").is_some() {
             return Err(HttpError::DuplicateContentLengthHeader);

tests/handler.rs

@@ -29,7 +29,7 @@ fn panics() {
     let server = TestServer::start(|_req| panic!("ignore this panic")).unwrap();
     assert_eq!(
         server.exchange("M / HTTP/1.1\r\n\r\n").unwrap(),
-        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\ncontent-length: 12\r\n\r\nServer error",
+        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\nconnection: close\r\ncontent-length: 12\r\n\r\nServer error",
     );
 }
 
@@ -149,6 +149,15 @@ fn method_not_allowed_405() {
     );
 }
 
+#[test]
+fn connection_close_on_5xx() {
+    let server = TestServer::start(|_req| Response::new(500)).unwrap();
+    assert_eq!(
+        server.exchange("M / HTTP/1.1\r\n\r\n").unwrap(),
+        "HTTP/1.1 500 Internal Server Error\r\nconnection: close\r\ncontent-length: 0\r\n\r\n",
+    );
+}
+
 #[test]
 fn duplicate_content_type_header() {
     let server = TestServer::start(|_req| {
@@ -228,7 +237,7 @@ fn body_not_pending() {
         server
             .exchange("M / HTTP/1.1\r\ncontent-length:3\r\n\r\nabc")
             .unwrap(),
-        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\ncontent-length: 21\r\n\r\nInternal server error",
+        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\nconnection: close\r\ncontent-length: 21\r\n\r\nInternal server error",
     );
 }
 
@@ -237,7 +246,7 @@ fn already_got_body() {
     let server = TestServer::start(|_req| Response::get_body_and_reprocess(70_000)).unwrap();
     assert_eq!(
         server.exchange(req_with_len(66_000)).unwrap(),
-        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\ncontent-length: 21\r\n\r\nInternal server error",
+        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\nconnection: close\r\ncontent-length: 21\r\n\r\nInternal server error",
     );
 }
 
@@ -265,7 +274,7 @@ fn error_writing_body_file() {
     std::thread::sleep(Duration::from_millis(100));
     assert_eq!(
         server.exchange(req_with_len(66_000)).unwrap(),
-        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\ncontent-length: 21\r\n\r\nInternal server error",
+        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\nconnection: close\r\ncontent-length: 21\r\n\r\nInternal server error",
     );
 }
 
@@ -286,7 +295,7 @@ fn error_reading_body_file() {
     server.cache_dir.take();
     assert_eq!(
         read_to_string(&mut tcp_stream).unwrap(),
-        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\ncontent-length: 12\r\n\r\nServer error",
+        "HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=UTF-8\r\nconnection: close\r\ncontent-length: 12\r\n\r\nServer error",
     );
 }