Skip to content

Upgrade content-disposition #7233

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
blakeembrey wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −22
Open

Upgrade content-disposition #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7296b81
Upgrade content-disposition
blakeembrey May 11, 2026
5b1dd33
Better backward compat
blakeembrey May 11, 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
10 changes: 6 additions & 4 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var cookie = require('cookie');
var send = require('send');
var extname = path.extname;
var resolve = path.resolve;
var basename = path.basename;
var vary = require('vary');
const { Buffer } = require('node:buffer');

Expand Down Expand Up @@ -454,7 +455,7 @@ res.download = function download (path, filename, options, callback) {

// set Content-Disposition when file is sent
var headers = {
'Content-Disposition': contentDisposition(name || path)
'Content-Disposition': contentDisposition.create(basename(name || path))
};

// merge user-provided headers
Expand Down Expand Up @@ -602,11 +603,12 @@ res.format = function(obj){
*/

res.attachment = function attachment(filename) {
if (filename) {
this.type(extname(filename));
const name = filename !== undefined ? basename(filename) : undefined;
if (name) {
this.type(extname(name));
}

this.set('Content-Disposition', contentDisposition(filename));
this.set('Content-Disposition', contentDisposition.create(name));

return this;
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"accepts": "^2.0.0",
"body-parser": "^2.2.1",
"content-disposition": "^1.0.0",
"content-disposition": "^2.0.0",
"content-type": "^1.0.5",
"cookie": "^0.7.1",
"cookie-signature": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions test/acceptance/downloads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('downloads', function(){
it('should have a download header', function (done) {
request(app)
.get('/files/notes/groceries.txt')
.expect('Content-Disposition', 'attachment; filename="groceries.txt"')
.expect('Content-Disposition', 'attachment; filename=groceries.txt')
.expect(200, done)
})
})
Expand All @@ -24,7 +24,7 @@ describe('downloads', function(){
it('should have a download header', function(done){
request(app)
.get('/files/amazing.txt')
.expect('Content-Disposition', 'attachment; filename="amazing.txt"')
.expect('Content-Disposition', 'attachment; filename=amazing.txt')
.expect(200, done)
})
})
Expand Down
2 changes: 1 addition & 1 deletion test/res.attachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('res', function(){

request(app)
.get('/')
.expect('Content-Disposition', 'attachment; filename="image.png"', done);
.expect('Content-Disposition', 'attachment; filename=image.png', done);
})

it('should set the Content-Type', function(done){
Expand Down
28 changes: 14 additions & 14 deletions test/res.download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'text/html; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="user.html"')
.expect('Content-Disposition', 'attachment; filename=user.html')
.expect(200, '<p>{{user.name}}</p>', done)
})

Expand Down Expand Up @@ -67,7 +67,7 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'text/html; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.expect(200, done)
})
})
Expand All @@ -84,7 +84,7 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'text/html; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="user.html"')
.expect('Content-Disposition', 'attachment; filename=user.html')
.expect(200, cb);
})

Expand Down Expand Up @@ -113,7 +113,7 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="name.txt"')
.expect('Content-Disposition', 'attachment; filename=name.txt')
.expect(200, 'tobi', cb)
})

Expand Down Expand Up @@ -162,7 +162,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename=".name"')
.expect('Content-Disposition', 'attachment; filename=.name')
.expect('Cache-Control', 'public, max-age=14400')
.expect(utils.shouldHaveBody(Buffer.from('tobi')))
.end(done)
Expand Down Expand Up @@ -259,7 +259,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename="user.html"')
.expect('Content-Disposition', 'attachment; filename=user.html')
.end(done)
})

Expand All @@ -277,7 +277,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename="user.html"')
.expect('Content-Disposition', 'attachment; filename=user.html')
.end(done)
})
})
Expand All @@ -296,7 +296,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename="name.txt"')
.expect('Content-Disposition', 'attachment; filename=name.txt')
.expect(utils.shouldHaveBody(Buffer.from('tobi')))
.end(done)
})
Expand All @@ -313,7 +313,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename="name.txt"')
.expect('Content-Disposition', 'attachment; filename=name.txt')
.expect(utils.shouldHaveBody(Buffer.from('tobi')))
.end(done)
})
Expand Down Expand Up @@ -367,7 +367,7 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'text/html; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.expect(200, cb);
})
})
Expand All @@ -386,7 +386,7 @@ describe('res', function(){
.get('/')
.expect(200)
.expect('Content-Type', 'text/html; charset=utf-8')
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.end(cb)
})

Expand All @@ -403,7 +403,7 @@ describe('res', function(){
request(app)
.get('/')
.expect(200)
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.expect('Cache-Control', 'public, max-age=14400')
.expect(utils.shouldHaveBody(Buffer.from('tobi')))
.end(done)
Expand All @@ -426,7 +426,7 @@ describe('res', function(){
.get('/')
.expect(200)
.expect('Content-Type', 'text/x-custom')
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.end(done)
})

Expand All @@ -446,7 +446,7 @@ describe('res', function(){
.get('/')
.expect(200)
.expect('Content-Type', 'text/x-custom')
.expect('Content-Disposition', 'attachment; filename="document"')
.expect('Content-Disposition', 'attachment; filename=document')
.end(done)
})
})
Expand Down
Loading