Skip to content

Commit ee7f043

Browse files
committed
1 parent 02f3dbe commit ee7f043

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

History.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ unreleased
22
==========
33

44
* Include HTML link in redirect response
5+
6+
- Accept string for `maxAge` (converted by `ms`)
57

68
1.2.3 / 2014-06-11
79
==================

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Options:
2828

2929
- `hidden` Allow transfer of hidden files. defaults to `false`
3030
- `index` Default file name, defaults to `'index.html'`
31-
- `maxAge` Browser cache maxAge in milliseconds. defaults to `0`
31+
- `maxAge` Browser cache maxAge in milliseconds. This can also be a string accepted by the [ms](https://www.npmjs.org/package/ms#readme) module. defaults to `0`
3232
- `redirect` Redirect to trailing "/" when the pathname is a dir. defaults to `true`
3333

3434
## Examples

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": {
99
"escape-html": "1.0.1",
1010
"parseurl": "1.0.1",
11-
"send": "0.4.3"
11+
"send": "0.5.0"
1212
},
1313
"devDependencies": {
1414
"istanbul": "0.2.13",

test/test.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,15 @@ describe('serveStatic()', function(){
128128
})
129129

130130
describe('maxAge', function(){
131-
var server;
132-
before(function () {
133-
server = createServer(fixtures, {'maxAge': Infinity});
134-
});
131+
it('should accept string', function(done){
132+
request(createServer(fixtures, {'maxAge': '30d'}))
133+
.get('/todo.txt')
134+
.expect('cache-control', 'public, max-age=' + 60*60*24*30)
135+
.expect(200, done)
136+
})
135137

136138
it('should be reasonable when infinite', function(done){
137-
request(server)
139+
request(createServer(fixtures, {'maxAge': Infinity}))
138140
.get('/todo.txt')
139141
.expect('cache-control', 'public, max-age=' + 60*60*24*365)
140142
.expect(200, done)

0 commit comments

Comments
 (0)