Skip to content

Commit 9339c54

Browse files
committed
Merge tag 'v1.15.0' into 2.0
1.15.0
2 parents 1362955 + 9b5a12a commit 9339c54

File tree

7 files changed

+359
-3629
lines changed

7 files changed

+359
-3629
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ jobs:
6161

6262
- name: Node.js 6.x
6363
node-version: "6.17"
64-
64+
6565

6666
- name: Node.js 7.x
6767
node-version: "7.10"
68-
68+
6969

7070
- name: Node.js 8.x
7171
node-version: "8.16"
@@ -90,16 +90,16 @@ jobs:
9090
node-version: "13.14"
9191

9292
- name: Node.js 14.x
93-
node-version: "14.18"
93+
node-version: "14.19"
9494

9595
- name: Node.js 15.x
9696
node-version: "15.14"
9797

9898
- name: Node.js 16.x
99-
node-version: "16.13"
99+
node-version: "16.14"
100100

101101
- name: Node.js 17.x
102-
node-version: "17.2"
102+
node-version: "17.8"
103103

104104
steps:
105105
- uses: actions/checkout@v2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
coverage/
33
node_modules/
44
npm-debug.log
5+
package-lock.json

HISTORY.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
- Use `mime-types` for file to content type mapping
99
1010

11+
1.15.0 / 2022-03-24
12+
===================
13+
14+
15+
- Fix emitted 416 error missing headers property
16+
- Limit the headers removed for 304 response
17+
18+
19+
20+
21+
22+
1123
1.14.2 / 2021-12-15
1224
===================
1325

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ function setCustomCacheControl (res, file) {
248248
[coveralls-image]: https://badgen.net/coveralls/c/github/expressjs/serve-static/master
249249
[coveralls-url]: https://coveralls.io/r/expressjs/serve-static?branch=master
250250
[github-actions-ci-image]: https://badgen.net/github/checks/expressjs/serve-static/master?label=linux
251-
[github-actions-ci-url]: https://github.com/expressjs/serve-static/actions?query=workflow%3Aci
251+
[github-actions-ci-url]: https://github.com/expressjs/serve-static/actions/workflows/ci.yml
252252
[node-image]: https://badgen.net/npm/node/serve-static
253253
[node-url]: https://nodejs.org/en/download/
254254
[npm-downloads-image]: https://badgen.net/npm/dm/serve-static

appveyor.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ environment:
1515
- nodejs_version: "11.15"
1616
- nodejs_version: "12.22"
1717
- nodejs_version: "13.14"
18-
- nodejs_version: "14.18"
18+
- nodejs_version: "14.19"
1919
- nodejs_version: "15.14"
20-
- nodejs_version: "16.13"
21-
- nodejs_version: "17.2"
20+
- nodejs_version: "16.14"
21+
- nodejs_version: "17.8"
2222
cache:
2323
- node_modules
2424
install:
@@ -61,10 +61,15 @@ install:
6161
# supertest for http calls
6262
# - use 2.0.0 for Node.js < 4
6363
# - use 3.4.2 for Node.js < 6
64-
if ([int]$env:nodejs_version.split(".")[0] -lt 4) {
64+
# - use 6.1.6 for Node.js < 8
65+
if ([int]$env:nodejs_version.split(".")[0] -eq 0 -and [int]$env:nodejs_version.split(".")[1] -lt 10) {
66+
npm install --silent --save-dev [email protected]
67+
} elseif ([int]$env:nodejs_version.split(".")[0] -lt 4) {
6568
npm install --silent --save-dev [email protected]
6669
} elseif ([int]$env:nodejs_version.split(".")[0] -lt 6) {
6770
npm install --silent --save-dev [email protected]
71+
} elseif ([int]$env:nodejs_version.split(".")[0] -lt 8) {
72+
npm install --silent --save-dev [email protected]
6873
}
6974
# Update Node.js modules
7075
- ps: |

0 commit comments

Comments
 (0)