From f7646bcc485f43ff4ba987cd613891883a081a07 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sun, 9 Jun 2024 00:04:42 -0500
Subject: [PATCH 1/2] actix-web-actors: take the internal buffer when yielding
 (#3369)

* actix-web-actors: take the internal buffer when yielding

* actix-web-actors: Add CHANGES entry re: taking buffer
---
 actix-web-actors/CHANGES.md | 1 +
 actix-web-actors/src/ws.rs  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/actix-web-actors/CHANGES.md b/actix-web-actors/CHANGES.md
index 9a622d8da..3e854c0b8 100644
--- a/actix-web-actors/CHANGES.md
+++ b/actix-web-actors/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Take the encoded buffer when yielding bytes in the response stream rather than splitting the buffer, reducing memory use
 - Minimum supported Rust version (MSRV) is now 1.72.
 
 ## 4.3.0
diff --git a/actix-web-actors/src/ws.rs b/actix-web-actors/src/ws.rs
index 1fb903225..7f7607fa9 100644
--- a/actix-web-actors/src/ws.rs
+++ b/actix-web-actors/src/ws.rs
@@ -710,7 +710,7 @@ where
         }
 
         if !this.buf.is_empty() {
-            Poll::Ready(Some(Ok(this.buf.split().freeze())))
+            Poll::Ready(Some(Ok(std::mem::take(&mut this.buf).freeze())))
         } else if this.fut.alive() && !this.closed {
             Poll::Pending
         } else {

From 22593a1532be29374100de0d256b493f2557bcd3 Mon Sep 17 00:00:00 2001
From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com>
Date: Sun, 9 Jun 2024 01:07:56 -0400
Subject: [PATCH 2/2] Re-export `http::status::InvalidStatusCode` (#3393)

* [actix-http/src/lib.rs] Expose/re-export `http::status::InvalidStatusCode`

* [actix-http/src/error.rs] Re-export `http::status::InvalidStatusCode` ; [actix-http/src/lib.rs] Revert
---
 actix-http/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index 69e2f14a1..6f332118e 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -3,7 +3,7 @@
 use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
 
 use derive_more::{Display, Error, From};
-pub use http::Error as HttpError;
+pub use http::{status::InvalidStatusCode, Error as HttpError};
 use http::{uri::InvalidUri, StatusCode};
 
 use crate::{body::BoxBody, Response};