itsi-scheduler 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8805c01ab4ea4fd6224589792a871b59a3c71495ee4763d8b326d071e0c5d054
-  data.tar.gz: ce752eefa1e8df13c891dcad689af2ee82d683373643f18af2c2daa9031dd7cb
+  metadata.gz: 5caaaee4ce54ed5b10274bf22f26b2b232ea414844609419b8cd54dbb67cd4b1
+  data.tar.gz: 8ab4bc34382d142d421e401aa6155a16a8e9684d1129cc29ea286f4f94d6a8c8
 SHA512:
-  metadata.gz: ce0bac7a7ea61036b0b58befccad25c1722521a92ddcfb8b6a538c6cac01f0928feb0d8b0a4b0fd089cae0dd95ab14f22137f96aa289450dd6fe958afc6745b7
-  data.tar.gz: 465b97224aa75c8e7ae1085adab18231fa6b852f431fe5562ae56dc6fd30e2024b04db48323d609cb5d4b9ba589c6bc336cd1ddd1da7f3aa8a50c00381dba918
+  metadata.gz: b51bccdd42078f880c2bcdc58826b1162499604b02d96eef3ea94c152e2f70628188d99575481ed20a82201ffa73a6dfc19b25ac6cc11f94dc9a573135010bee
+  data.tar.gz: acb1db014fefa155ab42204965641e6f02e91e7b5e4ba58de435694812109248ef2435753f923a2bef68104e71ad72b08020fce4eedc140f6e623e054ae830ee

data/Cargo.lock

@@ -57,7 +57,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -74,9 +74,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.19"
+version = "1.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
+checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
 dependencies = [
  "shlex",
 ]
@@ -154,7 +154,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "unicode-xid",
 ]
 
@@ -166,9 +166,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.14"
+version = "0.2.16"
 dependencies = [
  "bytes",
  "derive_more",
@@ -297,7 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -337,7 +337,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -443,7 +443,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -507,7 +507,7 @@ dependencies = [
  "quote",
  "regex",
  "shell-words",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -643,7 +643,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -698,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -733,7 +733,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -744,7 +744,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -819,7 +819,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -932,22 +932,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -956,46 +941,28 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -1008,48 +975,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"

data/ext/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.14"
+version = "0.2.16"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_scheduler/extconf.rb

@@ -3,4 +3,6 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("itsi/scheduler/itsi_scheduler")
+create_rust_makefile("itsi/scheduler/itsi_scheduler") do |r|
+  r.extra_rustflags = ["-C target-cpu=native"]
+end

data/ext/itsi_server/Cargo.lock

@@ -111,7 +111,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atty"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [

data/ext/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.14"
+version = "0.2.16"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"
@@ -43,7 +43,6 @@ itsi_tracing = { path = "../itsi_tracing" }
 itsi_acme = { path = "../itsi_acme" }
 jsonwebtoken = "9.3.1"
 magnus = { version = "0.7.1", features = ["bytes", "rb-sys"] }
-moka = { version = "0.12.10", features = ["sync"] }
 notify = { version = "8.0.0" }
 nix = { version = "0.29.0", features = [
   "socket",
@@ -55,6 +54,7 @@ nix = { version = "0.29.0", features = [
 num_cpus = "1.16.0"
 parking_lot = "0.12.3"
 pin-project = "1.1.9"
+phf = { version = "0.11.3", features = ["macros"] }
 rand = "0.9.0"
 rcgen = { version = "0.13.2", features = ["x509-parser", "pem"] }
 regex = "1.11.1"
@@ -89,3 +89,4 @@ sha-crypt = "0.5.0"
 argon2 = "0.5.3"
 core_affinity = "0.8.3"
 memchr = "2.7.4"
+quick_cache = "0.6.13"

data/ext/itsi_server/src/lib.rs

@@ -1,4 +1,5 @@
 #![deny(unused_crate_dependencies)]
+
 pub mod default_responses;
 pub mod env;
 pub mod prelude;

data/ext/itsi_server/src/ruby_types/itsi_grpc_call.rs

@@ -126,12 +126,12 @@ impl ItsiGrpcCall {
         nonblocking: bool,
     ) -> itsi_error::Result<HttpResponse> {
         let (request, mut receiver) = ItsiGrpcCall::new(hyper_request, context).await;
-        let shutdown_channel = context.service.shutdown_channel.clone();
+        let shutdown_channel = context.service.shutdown_receiver.clone();
         let response_stream = request.stream.clone();
         let sender = if nonblocking {
             &context.nonblocking_sender
         } else {
-            &context.sender
+            &context.job_sender
         };
         match sender
             .send(RequestJob::ProcessGrpcRequest(request, app))

data/ext/itsi_server/src/ruby_types/itsi_http_request.rs

@@ -180,24 +180,22 @@ impl ItsiHttpRequest {
     ) -> itsi_error::Result<HttpResponse> {
         match ItsiHttpRequest::new(hyper_request, context, script_name).await {
             Ok((request, mut receiver)) => {
-                let shutdown_channel = context.service.shutdown_channel.clone();
+                let shutdown_channel = context.service.shutdown_receiver.clone();
                 let response = request.response.clone();
                 let sender = if nonblocking {
                     &context.nonblocking_sender
                 } else {
-                    &context.sender
+                    &context.job_sender
                 };
                 match sender.try_send(RequestJob::ProcessHttpRequest(request, app)) {
                     Err(err) => match err {
-                        async_channel::TrySendError::Full(_) => {
-                            Ok(SERVICE_UNAVAILABLE_RESPONSE
-                                .to_http_response(context.accept.clone())
-                                .await)
-                        }
+                        async_channel::TrySendError::Full(_) => Ok(SERVICE_UNAVAILABLE_RESPONSE
+                            .to_http_response(context.accept)
+                            .await),
                         async_channel::TrySendError::Closed(err) => {
                             error!("Error occurred: {:?}", err);
                             Ok(INTERNAL_SERVER_ERROR_RESPONSE
-                                .to_http_response(context.accept.clone())
+                                .to_http_response(context.accept)
                                 .await)
                         }
                     },
@@ -309,7 +307,7 @@ impl ItsiHttpRequest {
             .parts
             .uri
             .host()
-            .unwrap_or_else(|| &self.context.listener.host))
+            .unwrap_or_else(|| &self.context.listener_info.host))
     }
 
     pub(crate) fn scheme(&self) -> MagnusResult<&str> {
@@ -318,7 +316,7 @@ impl ItsiHttpRequest {
             .uri
             .scheme()
             .map(|scheme| scheme.as_str())
-            .unwrap_or_else(|| &self.context.listener.scheme))
+            .unwrap_or_else(|| &self.context.listener_info.scheme))
     }
 
     pub(crate) fn headers(&self) -> MagnusResult<Vec<(&str, &str)>> {
@@ -354,7 +352,7 @@ impl ItsiHttpRequest {
             .parts
             .uri
             .port_u16()
-            .unwrap_or(self.context.listener.port))
+            .unwrap_or(self.context.listener_info.port))
     }
 
     pub(crate) fn body(&self) -> MagnusResult<Option<Value>> {

data/ext/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs

@@ -82,7 +82,7 @@ pub struct ServerParams {
     preexisting_listeners: Option<String>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum ItsiServerTokenPreference {
     Version,
     Name,
@@ -109,6 +109,7 @@ pub struct SocketOpts {
     pub listen_backlog: usize,
     pub nodelay: bool,
     pub recv_buffer_size: usize,
+    pub send_buffer_size: usize,
 }
 
 impl ServerParams {
@@ -248,6 +249,9 @@ impl ServerParams {
         let recv_buffer_size: usize = rb_param_hash
             .fetch::<_, Option<usize>>("recv_buffer_size")?
             .unwrap_or(262_144);
+        let send_buffer_size: usize = rb_param_hash
+            .fetch::<_, Option<usize>>("send_buffer_size")?
+            .unwrap_or(262_144);
 
         if let Some(level) = log_level {
             set_level(&level);
@@ -296,6 +300,7 @@ impl ServerParams {
             listen_backlog,
             nodelay,
             recv_buffer_size,
+            send_buffer_size,
         };
         let preexisting_listeners = rb_param_hash.delete::<_, Option<String>>("listeners")?;
 

data/ext/itsi_server/src/server/binds/listener.rs

@@ -111,7 +111,7 @@ impl TokioListener {
         Self::to_tokio_io(Stream::TcpStream(tcp_stream), None).await
     }
 
-    pub async fn spawn_state_task(&self, mut shutdown_receiver: Receiver<RunningPhase>) {
+    pub async fn spawn_acme_event_task(&self, mut shutdown_receiver: Receiver<RunningPhase>) {
         if let TokioListener::TcpTls(
             _,
             ItsiTlsAcceptor::Automatic(_acme_acceptor, state, _server_config),
@@ -414,6 +414,9 @@ fn connect_tcp_socket(addr: IpAddr, port: u16, socket_opts: &SocketOpts) -> Resu
     socket.set_reuse_port(socket_opts.reuse_port).ok();
     socket.set_nonblocking(true).ok();
     socket.set_nodelay(socket_opts.nodelay).ok();
+    socket
+        .set_send_buffer_size(socket_opts.send_buffer_size)
+        .ok();
     socket
         .set_recv_buffer_size(socket_opts.recv_buffer_size)
         .ok();

data/ext/itsi_server/src/server/http_message_types.rs

@@ -32,7 +32,7 @@ pub trait PathExt {
     fn no_trailing_slash(&self) -> &str;
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum ResponseFormat {
     JSON,
     HTML,

data/ext/itsi_server/src/server/middleware_stack/middlewares/error_response/default_responses.rs

@@ -2,84 +2,84 @@ use super::{ContentSource, DefaultFormat, ErrorResponse};
 use crate::server::http_message_types::ResponseFormat;
 use bytes::Bytes;
 use http_body_util::{combinators::BoxBody, Full};
-use std::{convert::Infallible, sync::Arc};
+use std::convert::Infallible;
 
 impl DefaultFormat {
     pub fn response_for_code(&self, code: u16) -> ContentSource {
         match self {
             DefaultFormat::Plaintext => match code {
-                500 => ContentSource::Static(Arc::new("500 Internal Error".into())),
-                404 => ContentSource::Static(Arc::new("404 Not Found".into())),
-                401 => ContentSource::Static(Arc::new("401 Unauthorized".into())),
-                403 => ContentSource::Static(Arc::new("403 Forbidden".into())),
-                413 => ContentSource::Static(Arc::new("413 Payload Too Large".into())),
-                429 => ContentSource::Static(Arc::new("429 Too Many Requests".into())),
-                502 => ContentSource::Static(Arc::new("502 Bad Gateway".into())),
-                503 => ContentSource::Static(Arc::new("503 Service Unavailable".into())),
-                504 => ContentSource::Static(Arc::new("504 Gateway Timeout".into())),
-                _ => ContentSource::Static(Arc::new("Unexpected Error".into())),
+                500 => ContentSource::Static(Full::new("500 Internal Error".into())),
+                404 => ContentSource::Static(Full::new("404 Not Found".into())),
+                401 => ContentSource::Static(Full::new("401 Unauthorized".into())),
+                403 => ContentSource::Static(Full::new("403 Forbidden".into())),
+                413 => ContentSource::Static(Full::new("413 Payload Too Large".into())),
+                429 => ContentSource::Static(Full::new("429 Too Many Requests".into())),
+                502 => ContentSource::Static(Full::new("502 Bad Gateway".into())),
+                503 => ContentSource::Static(Full::new("503 Service Unavailable".into())),
+                504 => ContentSource::Static(Full::new("504 Gateway Timeout".into())),
+                _ => ContentSource::Static(Full::new("Unexpected Error".into())),
             },
             DefaultFormat::Html => match code {
-                500 => ContentSource::Static(Arc::new(
+                500 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/500.html").into(),
                 )),
-                404 => ContentSource::Static(Arc::new(
+                404 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/404.html").into(),
                 )),
-                401 => ContentSource::Static(Arc::new(
+                401 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/401.html").into(),
                 )),
-                403 => ContentSource::Static(Arc::new(
+                403 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/403.html").into(),
                 )),
-                413 => ContentSource::Static(Arc::new(
+                413 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/413.html").into(),
                 )),
-                429 => ContentSource::Static(Arc::new(
+                429 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/429.html").into(),
                 )),
-                502 => ContentSource::Static(Arc::new(
+                502 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/502.html").into(),
                 )),
-                503 => ContentSource::Static(Arc::new(
+                503 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/503.html").into(),
                 )),
-                504 => ContentSource::Static(Arc::new(
+                504 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/504.html").into(),
                 )),
-                _ => ContentSource::Static(Arc::new(
+                _ => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/html/500.html").into(),
                 )),
             },
             DefaultFormat::Json => match code {
-                500 => ContentSource::Static(Arc::new(
+                500 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/500.json").into(),
                 )),
-                404 => ContentSource::Static(Arc::new(
+                404 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/404.json").into(),
                 )),
-                401 => ContentSource::Static(Arc::new(
+                401 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/401.json").into(),
                 )),
-                403 => ContentSource::Static(Arc::new(
+                403 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/403.json").into(),
                 )),
-                413 => ContentSource::Static(Arc::new(
+                413 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/413.json").into(),
                 )),
-                429 => ContentSource::Static(Arc::new(
+                429 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/429.json").into(),
                 )),
-                502 => ContentSource::Static(Arc::new(
+                502 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/502.json").into(),
                 )),
-                503 => ContentSource::Static(Arc::new(
+                503 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/503.json").into(),
                 )),
-                504 => ContentSource::Static(Arc::new(
+                504 => ContentSource::Static(Full::new(
                     include_str!("../../../../default_responses/json/504.json").into(),
                 )),
-                _ => ContentSource::Static(Arc::new("Unexpected Error".into())),
+                _ => ContentSource::Static(Full::new("Unexpected Error".into())),
             },
         }
     }
@@ -94,9 +94,7 @@ impl ErrorResponse {
         };
         match source {
             ContentSource::Inline(bytes) => BoxBody::new(Full::new(Bytes::from(bytes))),
-            ContentSource::Static(text) => {
-                BoxBody::new(Full::new(Bytes::from(String::from(text.as_str()))))
-            }
+            ContentSource::Static(bytes) => BoxBody::new(bytes),
             ContentSource::File(_) => BoxBody::new(Full::new(Bytes::from("Unexpected error"))),
         }
     }

data/ext/itsi_server/src/server/middleware_stack/middlewares/error_response.rs

@@ -5,7 +5,6 @@ use http_body_util::{combinators::BoxBody, Full};
 use serde::{Deserialize, Deserializer};
 use std::convert::Infallible;
 use std::path::PathBuf;
-use std::sync::Arc;
 use tracing::warn;
 
 use crate::server::http_message_types::{HttpResponse, ResponseFormat};
@@ -20,7 +19,7 @@ pub enum ContentSource {
     File(PathBuf),
     #[serde(rename(deserialize = "static"))]
     #[serde(skip_deserializing)]
-    Static(Arc<String>),
+    Static(Full<Bytes>),
 }
 
 #[derive(Debug, Clone, Deserialize, Default)]
@@ -151,13 +150,13 @@ impl ErrorResponse {
                 return BoxBody::new(Full::new(Bytes::from(text.clone())));
             }
             Some(ContentSource::Static(text)) => {
-                return BoxBody::new(Full::new(Bytes::from(String::from(text.as_str()))));
+                return BoxBody::new(text.clone());
             }
             Some(ContentSource::File(path)) => {
                 // Convert the PathBuf to a &str (assumes valid UTF-8).
                 if let Some(path_str) = path.to_str() {
                     let response = ROOT_STATIC_FILE_SERVER
-                        .serve_single(path_str, accept.clone(), &[])
+                        .serve_single(path_str, accept, &[])
                         .await;
                     if response.status().is_success() {
                         return response.into_body();