Capture all IANA top level content types

sveltejs · Jan 24, 2025 · 4f7c4b9 · 4f7c4b9
1 parent 2acfb3b
commit 4f7c4b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/packages/kit/src/runtime/server/validate-headers.js b/packages/kit/src/runtime/server/validate-headers.js
@@ -18,7 +18,7 @@ const VALID_CACHE_CONTROL_DIRECTIVES = new Set([
 ]);
 
 const CONTENT_TYPE_PATTERN =
-	/^(application|audio|font|image|model|text|video|x-[a-z]+)\/[-+.\w]+$/i;
+	/^(application|audio|example|font|haptics|image|message|model|multipart|text|video|x-[a-z]+)\/[-+.\w]+$/i;
 
 /** @type {Record<string, (value: string) => void>} */
 const HEADER_VALIDATORS = {

diff --git a/packages/kit/src/runtime/server/validate-headers.spec.js b/packages/kit/src/runtime/server/validate-headers.spec.js
@@ -50,6 +50,11 @@ describe('validateHeaders', () => {
 				expect.stringContaining('cache-control header contains empty directives')
 			);
 		});
+
+		test('accepts multiple cache-control values', () => {
+			validateHeaders({ 'cache-control': 'max-age=3600, s-maxage=7200' });
+			expect(console.warn).not.toHaveBeenCalled();
+		});
 	});
 
 	describe('content-type header', () => {
@@ -89,10 +94,24 @@ describe('validateHeaders', () => {
 				expect.stringContaining('Invalid content-type value "bad/type"')
 			);
 		});
+
+		test('handles case-insensitive content-types', () => {
+			validateHeaders({ 'content-type': 'TEXT/HTML; charset=utf-8' });
+			expect(console.warn).not.toHaveBeenCalled();
+		});
 	});
 
 	test('allows unknown headers', () => {
 		validateHeaders({ 'x-custom-header': 'some-value' });
 		expect(console.warn).not.toHaveBeenCalled();
 	});
+
+	test('handles multiple headers simultaneously', () => {
+		validateHeaders({
+			'cache-control': 'max-age=3600',
+			'content-type': 'text/html',
+			'x-custom': 'value'
+		});
+		expect(console.warn).not.toHaveBeenCalled();
+	});
 });