Skip to content
Merged
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
6 changes: 6 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
unreleased
==========

* Allow conditional revalidation for QUERY requests
- `req.fresh` now includes QUERY in the freshness check, so QUERY responses can return 304 when a validator matches

4.22.2 / 2026-05-11
==========

Expand Down
4 changes: 2 additions & 2 deletions lib/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ defineGetter(req, 'fresh', function(){
var res = this.res
var status = res.statusCode

// GET or HEAD for weak freshness validation only
if ('GET' !== method && 'HEAD' !== method) return false;
// GET, HEAD, or QUERY for weak freshness validation only
if ('GET' !== method && 'HEAD' !== method && 'QUERY' !== method) return false;

// 2xx or 304 as per rfc2616 14.26
if ((status >= 200 && status < 300) || 304 === status) {
Expand Down
38 changes: 38 additions & 0 deletions test/req.fresh.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

var express = require('../')
, request = require('supertest');
var shouldSkipQuery = require('./support/utils').shouldSkipQuery

describe('req', function(){
describe('.fresh', function(){
Expand Down Expand Up @@ -46,5 +47,42 @@ describe('req', function(){
.get('/')
.expect(200, 'false', done);
})

it('should return true for a QUERY request with a body when the resource is not modified', function(done){
if (shouldSkipQuery(process.versions.node)) {
this.skip()
}
var app = express();
var etag = '"12345"';

app.use(function(req, res){
res.set('ETag', etag);
res.send(req.fresh);
});

request(app)
.query('/')
.set('If-None-Match', etag)
.send({ ids: ['a', 'b'] })
.expect(304, done);
})

it('should return false for a QUERY request with a body when the resource is modified', function(done){
if (shouldSkipQuery(process.versions.node)) {
this.skip()
}
var app = express();

app.use(function(req, res){
res.set('ETag', '"123"');
res.send(req.fresh);
});

request(app)
.query('/')
.set('If-None-Match', '"12345"')
.send({ ids: ['a', 'b'] })
.expect(200, 'false', done);
})
})
})
Loading