Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/response.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,9 @@ res.sendFile = function sendFile(path, options, callback) {
// create file stream
var pathname = encodeURI(path);

opts = Object.create(opts);
// wire application etag option to send
opts.etag = this.app.enabled('etag');
opts.etag ??= this.app.enabled('etag');
var file = send(req, pathname, opts);

// transfer
Expand Down
33 changes: 33 additions & 0 deletions test/res.sendFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,39 @@ describe('res', function(){
}
});

it('should let an explicit etag option turn the ETag off', function (done) {
var app = createApp(path.resolve(fixtures, 'name.txt'), { etag: false });

request(app)
.get('/')
.expect(handleHeaders)
.expect(200, done);

function handleHeaders (res) {
assert(res.headers.etag === undefined);
}
});

it('should let an explicit etag option turn the ETag on', function (done) {
var app = createApp(path.resolve(fixtures, 'name.txt'), { etag: true }).disable('etag');

request(app)
.get('/')
.expect('ETag', /^(?:W\/)?"[^"]+"$/)
.expect(200, done);
});

it('should not modify the options object', function (done) {
var options = {};
var app = createApp(path.resolve(fixtures, 'name.txt'), options).disable('etag');

request(app)
.get('/')
.expect(utils.shouldNotHaveHeader('ETag'))
.expect(() => assert.deepStrictEqual(options, {}))
.expect(200, done);
});

it('should 404 for directory', function (done) {
var app = createApp(path.resolve(fixtures, 'blog'));

Expand Down