Skip to content

feat: do not modify the Content-Type twice when sending strings #6991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjohansebas wants to merge 4 commits into
base: master
Choose a base branch
from
+6 −13
Open

feat: do not modify the Content-Type twice when sending strings #6991

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e24588
fix: improve content-type handling in res.send method
bjohansebas Jan 15, 2026
51caad2
fix: ensure content-type is a string before setting charset in res.send
bjohansebas Jan 16, 2026
1f683d5
fix: refactor content-type handling in res.send to use const and impr…
bjohansebas Jan 16, 2026
bf678ff
Apply suggestion from @bjohansebas
bjohansebas Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,19 @@ res.send = function send(body) {
var chunk = body;
var encoding;
var req = this.req;
var type;

// settings
var app = this.app;

switch (typeof chunk) {
// string defaulting to html
case 'string':
if (!this.get('Content-Type')) {
encoding = 'utf8';
const type = this.get('Content-Type');

if (typeof type === 'string') {
this.set('Content-Type', setCharset(type, 'utf-8'));
} else {
this.type('html');
}
break;
Expand All @@ -153,17 +157,6 @@ res.send = function send(body) {
break;
}

// write strings in utf-8
if (typeof chunk === 'string') {
encoding = 'utf8';
type = this.get('Content-Type');

// reflect this in content-type
if (typeof type === 'string') {
this.set('Content-Type', setCharset(type, 'utf-8'));
}
}

// determine if ETag should be generated
var etagFn = app.get('etag fn')
var generateETag = !this.get('ETag') && typeof etagFn === 'function'
Expand Down