From bab9934eb7ce4d921325f350802d188ab70af674 Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Wed, 8 Jan 2025 19:02:48 +0000
Subject: [PATCH] fix: host not in route handler url when using external
 middleware

---
 .changeset/little-geese-study.md                   | 5 +++++
 packages/open-next/src/build/createServerBundle.ts | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/little-geese-study.md

diff --git a/.changeset/little-geese-study.md b/.changeset/little-geese-study.md
new file mode 100644
index 000000000..1c8bb097b
--- /dev/null
+++ b/.changeset/little-geese-study.md
@@ -0,0 +1,5 @@
+---
+'@opennextjs/aws': patch
+---
+
+Mark the host header as trusted when the OpenNext project has external middleware to align with normal behavior for the Next.js server.
diff --git a/packages/open-next/src/build/createServerBundle.ts b/packages/open-next/src/build/createServerBundle.ts
index 3b750f98b..e5de80540 100644
--- a/packages/open-next/src/build/createServerBundle.ts
+++ b/packages/open-next/src/build/createServerBundle.ts
@@ -196,8 +196,7 @@ async function generateBundle(
       target: /core(\/|\\)util\.js/g,
       deletes: [
         ...(disableNextPrebundledReact ? ["requireHooks"] : []),
-        ...(disableRouting ? ["trustHostHeader"] : []),
-        ...(!isBefore13413 ? ["requestHandlerHost"] : []),
+        ...(isBefore13413 ? ["trustHostHeader"] : ["requestHandlerHost"]),
         ...(isAfter141
           ? ["experimentalIncrementalCacheHandler"]
           : ["stableIncrementalCache"]),