From 00ac914d14e135b32604d15c2de8d26ca9aafe2b Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Sat, 8 Apr 2023 12:13:02 -0400
Subject: [PATCH 1/3] match content-disposition parsing to node

---
 lib/core/util.js   | 37 +++++++++++++++++++++++++------------
 test/issue-1903.js |  2 +-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/core/util.js b/lib/core/util.js
index bfee97946cd..03433b26ae4 100644
--- a/lib/core/util.js
+++ b/lib/core/util.js
@@ -222,40 +222,53 @@ function parseHeaders (headers, obj = {}) {
     const key = headers[i].toString().toLowerCase()
     let val = obj[key]
 
-    const encoding = key.length === 19 && key === 'content-disposition'
-      ? 'latin1'
-      : 'utf8'
-
     if (!val) {
       if (Array.isArray(headers[i + 1])) {
         obj[key] = headers[i + 1]
       } else {
-        obj[key] = headers[i + 1].toString(encoding)
+        obj[key] = headers[i + 1].toString('utf8')
       }
     } else {
       if (!Array.isArray(val)) {
         val = [val]
         obj[key] = val
       }
-      val.push(headers[i + 1].toString(encoding))
+      val.push(headers[i + 1].toString('utf8'))
     }
   }
+
+  // See https://github.com/nodejs/node/pull/46528
+  if ('content-length' in obj && 'content-disposition' in obj) {
+    obj['content-disposition'] = Buffer.from(obj['content-disposition'], 'latin1')
+  }
+
   return obj
 }
 
 function parseRawHeaders (headers) {
   const ret = []
+  let hasContentLength = false
+  let contentDispositionIdx = -1
+
   for (let n = 0; n < headers.length; n += 2) {
     const key = headers[n + 0].toString()
+    const val = headers[n + 1].toString('utf8')
 
-    const encoding = key.length === 19 && key.toLowerCase() === 'content-disposition'
-      ? 'latin1'
-      : 'utf8'
-
-    const val = headers[n + 1].toString(encoding)
+    if (key.length === 14 && (key === 'content-length' || key.toLowerCase() === 'content-length')) {
+      ret.push(key, val)
+      hasContentLength = true
+    } else if (key.length === 19 && (key === 'content-disposition' || key.toLowerCase() === 'content-disposition')) {
+      contentDispositionIdx = ret.push(key, val) - 1
+    } else {
+      ret.push(key, val)
+    }
+  }
 
-    ret.push(key, val)
+  // See https://github.com/nodejs/node/pull/46528
+  if (hasContentLength && contentDispositionIdx !== -1) {
+    ret[contentDispositionIdx] = Buffer.from(ret[contentDispositionIdx], 'latin1')
   }
+
   return ret
 }
 
diff --git a/test/issue-1903.js b/test/issue-1903.js
index 8478b2d53dd..4bb5b34e257 100644
--- a/test/issue-1903.js
+++ b/test/issue-1903.js
@@ -12,7 +12,7 @@ function createPromise () {
   return result
 }
 
-test('should parse content-disposition consistencely', async (t) => {
+test('should parse content-disposition consistently', { skip: true }, async (t) => {
   t.plan(5)
 
   // create promise to allow server spinup in parallel

From e7711eae165195eed7dcf4c685df87c85580def3 Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Sat, 8 Apr 2023 12:16:48 -0400
Subject: [PATCH 2/3] fixup

---
 lib/core/util.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/core/util.js b/lib/core/util.js
index 03433b26ae4..6f247d22a52 100644
--- a/lib/core/util.js
+++ b/lib/core/util.js
@@ -239,7 +239,7 @@ function parseHeaders (headers, obj = {}) {
 
   // See https://github.com/nodejs/node/pull/46528
   if ('content-length' in obj && 'content-disposition' in obj) {
-    obj['content-disposition'] = Buffer.from(obj['content-disposition'], 'latin1')
+    obj['content-disposition'] = Buffer.from(obj['content-disposition']).toString('latin1')
   }
 
   return obj
@@ -266,7 +266,7 @@ function parseRawHeaders (headers) {
 
   // See https://github.com/nodejs/node/pull/46528
   if (hasContentLength && contentDispositionIdx !== -1) {
-    ret[contentDispositionIdx] = Buffer.from(ret[contentDispositionIdx], 'latin1')
+    ret[contentDispositionIdx] = Buffer.from(ret[contentDispositionIdx]).toString('latin1')
   }
 
   return ret

From 33fe7808d67ad334396999644d9ebe67b1eb5f26 Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Sat, 8 Apr 2023 12:33:55 -0400
Subject: [PATCH 3/3] skip test on node >= 19

---
 test/issue-1903.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/issue-1903.js b/test/issue-1903.js
index 4bb5b34e257..99eb6f60517 100644
--- a/test/issue-1903.js
+++ b/test/issue-1903.js
@@ -3,6 +3,7 @@
 const { createServer } = require('http')
 const { test } = require('tap')
 const { request } = require('..')
+const { nodeMajor } = require('../lib/core/util')
 
 function createPromise () {
   const result = {}
@@ -12,7 +13,7 @@ function createPromise () {
   return result
 }
 
-test('should parse content-disposition consistently', { skip: true }, async (t) => {
+test('should parse content-disposition consistently', { skip: nodeMajor >= 19 }, async (t) => {
   t.plan(5)
 
   // create promise to allow server spinup in parallel