Merge branch 'canary' into fix-52935

packages/next/src/server/lib/server-ipc/utils.ts

@@ -13,6 +13,7 @@ export const ipcForbiddenHeaders = [
 export const actionsForbiddenHeaders = [
   ...ipcForbiddenHeaders,
   'content-length',
+  'set-cookie',
 ]
 
 export const filterReqHeaders = (

test/e2e/app-dir/app-basepath-custom-server/custom-server/app/page.js

@@ -1,8 +1,12 @@
 import { redirect } from 'next/navigation'
+import { cookies } from 'next/headers'
 
 async function action() {
   'use server'
-
+  cookies().set(
+    'custom-server-action-test-cookie',
+    'custom-server-action-test-cookie-val'
+  )
   redirect('/another')
 }
 

test/e2e/app-dir/app-basepath-custom-server/custom-server/server.js

@@ -18,7 +18,10 @@ async function main() {
     try {
       const parsedUrl = parse(req.url, true)
       const { pathname } = parsedUrl
-
+      res.setHeader(
+        'set-cookie',
+        'custom-server-test-cookie=custom-server-test-cookie-val'
+      )
       if (pathname.startsWith('/base')) {
         await handle(req, res, parsedUrl)
       } else {

test/e2e/app-dir/app-basepath-custom-server/index.test.ts

@@ -1,6 +1,6 @@
-import { join } from 'path'
 import { createNextDescribe } from 'e2e-utils'
-import { retry } from 'next-test-utils'
+import { check, retry } from 'next-test-utils'
+import { join } from 'path'
 
 createNextDescribe(
   'custom-app-server-action-redirect',
@@ -35,5 +35,26 @@ createNextDescribe(
       // Count should still be 2 as the browser should not have reloaded the page.
       expect(await getCount()).toBe('Count: 2')
     })
+
+    it('redirects with proper cookies set from both redirect response and post respose', async () => {
+      const browser = await next.browser('/base')
+
+      await browser.elementById('submit-server-action-redirect').click()
+
+      expect(await browser.waitForElementByCss('#another').text()).toBe(
+        'Another Page'
+      )
+      expect(await browser.url()).toBe(
+        `http://localhost:${next.appPort}/base/another`
+      )
+      await check(
+        () => browser.eval('document.cookie'),
+        /custom-server-test-cookie/
+      )
+      await check(
+        () => browser.eval('document.cookie'),
+        /custom-server-action-test-cookie/
+      )
+    })
   }
 )