Skip to content

Commit 4ea4945

Browse files
UzlopakUzlopak
committed
cache: change normaliseHeaders to normalizeHeaders
1 parent 6ca7da0 commit 4ea4945

13 files changed

Lines changed: 75 additions & 75 deletions

File tree

‎lib/interceptor/cache.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const util = require('../core/util')
66
const CacheHandler = require('../handler/cache-handler')
77
const MemoryCacheStore = require('../cache/memory-cache-store')
88
const CacheRevalidationHandler = require('../handler/cache-revalidation-handler')
9-
const { assertCacheStore, assertCacheMethods, makeCacheKey, normaliseHeaders, parseCacheControlHeader } = require('../util/cache.js')
9+
const { assertCacheStore, assertCacheMethods, makeCacheKey, normalizeHeaders, parseCacheControlHeader } = require('../util/cache.js')
1010
const { AbortError } = require('../core/errors.js')
1111

1212
/**
@@ -326,7 +326,7 @@ module.exports = (opts = {}) => {
326326

327327
opts = {
328328
...opts,
329-
headers: normaliseHeaders(opts)
329+
headers: normalizeHeaders(opts)
330330
}
331331

332332
const reqCacheControl = opts.headers?.['cache-control']

‎lib/util/cache.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function makeCacheKey (opts) {
3434
* @param {Record<string, string[] | string>}
3535
* @returns {Record<string, string[] | string>}
3636
*/
37-
function normaliseHeaders (opts) {
37+
function normalizeHeaders (opts) {
3838
let headers
3939
if (opts.headers == null) {
4040
headers = {}
@@ -367,7 +367,7 @@ function assertCacheMethods (methods, name = 'CacheMethods') {
367367

368368
module.exports = {
369369
makeCacheKey,
370-
normaliseHeaders,
370+
normalizeHeaders,
371371
assertCacheKey,
372372
assertCacheValue,
373373
parseCacheControlHeader,

‎test/fixtures/cache-tests/results/apache.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -650,24 +650,24 @@
650650
"vary-invalidate": true,
651651
"vary-match": true,
652652
"vary-no-match": true,
653-
"vary-normalise-combine": true,
654-
"vary-normalise-lang-case": [
653+
"vary-normalize-combine": true,
654+
"vary-normalize-lang-case": [
655655
"Assertion",
656656
"Response 2 does not come from cache"
657657
],
658-
"vary-normalise-lang-order": [
658+
"vary-normalize-lang-order": [
659659
"Assertion",
660660
"Response 2 does not come from cache"
661661
],
662-
"vary-normalise-lang-select": [
662+
"vary-normalize-lang-select": [
663663
"Assertion",
664664
"Response 2 does not come from cache"
665665
],
666-
"vary-normalise-lang-space": [
666+
"vary-normalize-lang-space": [
667667
"Assertion",
668668
"Response 2 does not come from cache"
669669
],
670-
"vary-normalise-space": [
670+
"vary-normalize-space": [
671671
"Assertion",
672672
"Response 2 does not come from cache"
673673
],

‎test/fixtures/cache-tests/results/caddy.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -794,24 +794,24 @@
794794
"vary-invalidate": true,
795795
"vary-match": true,
796796
"vary-no-match": true,
797-
"vary-normalise-combine": true,
798-
"vary-normalise-lang-case": [
797+
"vary-normalize-combine": true,
798+
"vary-normalize-lang-case": [
799799
"Assertion",
800800
"Response 2 does not come from cache"
801801
],
802-
"vary-normalise-lang-order": [
802+
"vary-normalize-lang-order": [
803803
"Assertion",
804804
"Response 2 does not come from cache"
805805
],
806-
"vary-normalise-lang-select": [
806+
"vary-normalize-lang-select": [
807807
"Assertion",
808808
"Response 2 does not come from cache"
809809
],
810-
"vary-normalise-lang-space": [
810+
"vary-normalize-lang-space": [
811811
"Assertion",
812812
"Response 2 does not come from cache"
813813
],
814-
"vary-normalise-space": [
814+
"vary-normalize-space": [
815815
"Assertion",
816816
"Response 2 does not come from cache"
817817
],

‎test/fixtures/cache-tests/results/chrome.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,24 +565,24 @@
565565
],
566566
"vary-match": true,
567567
"vary-no-match": true,
568-
"vary-normalise-combine": true,
569-
"vary-normalise-lang-case": [
568+
"vary-normalize-combine": true,
569+
"vary-normalize-lang-case": [
570570
"Assertion",
571571
"Response 2 does not come from cache"
572572
],
573-
"vary-normalise-lang-order": [
573+
"vary-normalize-lang-order": [
574574
"Assertion",
575575
"Response 2 does not come from cache"
576576
],
577-
"vary-normalise-lang-select": [
577+
"vary-normalize-lang-select": [
578578
"Assertion",
579579
"Response 2 does not come from cache"
580580
],
581-
"vary-normalise-lang-space": [
581+
"vary-normalize-lang-space": [
582582
"Assertion",
583583
"Response 2 does not come from cache"
584584
],
585-
"vary-normalise-space": [
585+
"vary-normalize-space": [
586586
"Assertion",
587587
"Response 2 does not come from cache"
588588
],

‎test/fixtures/cache-tests/results/fastly.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -821,24 +821,24 @@
821821
"vary-invalidate": true,
822822
"vary-match": true,
823823
"vary-no-match": true,
824-
"vary-normalise-combine": true,
825-
"vary-normalise-lang-case": [
824+
"vary-normalize-combine": true,
825+
"vary-normalize-lang-case": [
826826
"Assertion",
827827
"Response 2 does not come from cache"
828828
],
829-
"vary-normalise-lang-order": [
829+
"vary-normalize-lang-order": [
830830
"Assertion",
831831
"Response 2 does not come from cache"
832832
],
833-
"vary-normalise-lang-select": [
833+
"vary-normalize-lang-select": [
834834
"Assertion",
835835
"Response 2 does not come from cache"
836836
],
837-
"vary-normalise-lang-space": [
837+
"vary-normalize-lang-space": [
838838
"Assertion",
839839
"Response 2 does not come from cache"
840840
],
841-
"vary-normalise-space": [
841+
"vary-normalize-space": [
842842
"Assertion",
843843
"Response 2 does not come from cache"
844844
],

‎test/fixtures/cache-tests/results/firefox.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,24 +547,24 @@
547547
],
548548
"vary-match": true,
549549
"vary-no-match": true,
550-
"vary-normalise-combine": true,
551-
"vary-normalise-lang-case": [
550+
"vary-normalize-combine": true,
551+
"vary-normalize-lang-case": [
552552
"Assertion",
553553
"Response 2 does not come from cache"
554554
],
555-
"vary-normalise-lang-order": [
555+
"vary-normalize-lang-order": [
556556
"Assertion",
557557
"Response 2 does not come from cache"
558558
],
559-
"vary-normalise-lang-select": [
559+
"vary-normalize-lang-select": [
560560
"Assertion",
561561
"Response 2 does not come from cache"
562562
],
563-
"vary-normalise-lang-space": [
563+
"vary-normalize-lang-space": [
564564
"Assertion",
565565
"Response 2 does not come from cache"
566566
],
567-
"vary-normalise-space": [
567+
"vary-normalize-space": [
568568
"Assertion",
569569
"Response 2 does not come from cache"
570570
],

‎test/fixtures/cache-tests/results/nginx.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -806,21 +806,21 @@
806806
"vary-invalidate": true,
807807
"vary-match": true,
808808
"vary-no-match": true,
809-
"vary-normalise-combine": true,
810-
"vary-normalise-lang-case": [
809+
"vary-normalize-combine": true,
810+
"vary-normalize-lang-case": [
811811
"AbortError",
812812
"This operation was aborted"
813813
],
814-
"vary-normalise-lang-order": [
814+
"vary-normalize-lang-order": [
815815
"Assertion",
816816
"Response 2 does not come from cache"
817817
],
818-
"vary-normalise-lang-select": [
818+
"vary-normalize-lang-select": [
819819
"Assertion",
820820
"Response 2 does not come from cache"
821821
],
822-
"vary-normalise-lang-space": true,
823-
"vary-normalise-space": [
822+
"vary-normalize-lang-space": true,
823+
"vary-normalize-space": [
824824
"Assertion",
825825
"Response 2 does not come from cache"
826826
],

‎test/fixtures/cache-tests/results/safari.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -577,24 +577,24 @@
577577
],
578578
"vary-match": true,
579579
"vary-no-match": true,
580-
"vary-normalise-combine": true,
581-
"vary-normalise-lang-case": [
580+
"vary-normalize-combine": true,
581+
"vary-normalize-lang-case": [
582582
"Assertion",
583583
"Response 2 does not come from cache"
584584
],
585-
"vary-normalise-lang-order": [
585+
"vary-normalize-lang-order": [
586586
"Assertion",
587587
"Response 2 does not come from cache"
588588
],
589-
"vary-normalise-lang-select": [
589+
"vary-normalize-lang-select": [
590590
"Assertion",
591591
"Response 2 does not come from cache"
592592
],
593-
"vary-normalise-lang-space": [
593+
"vary-normalize-lang-space": [
594594
"Assertion",
595595
"Response 2 does not come from cache"
596596
],
597-
"vary-normalise-space": [
597+
"vary-normalize-space": [
598598
"Assertion",
599599
"Response 2 does not come from cache"
600600
],

‎test/fixtures/cache-tests/results/squid.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -641,24 +641,24 @@
641641
"vary-invalidate": true,
642642
"vary-match": true,
643643
"vary-no-match": true,
644-
"vary-normalise-combine": true,
645-
"vary-normalise-lang-case": [
644+
"vary-normalize-combine": true,
645+
"vary-normalize-lang-case": [
646646
"Assertion",
647647
"Response 2 does not come from cache"
648648
],
649-
"vary-normalise-lang-order": [
649+
"vary-normalize-lang-order": [
650650
"Assertion",
651651
"Response 2 does not come from cache"
652652
],
653-
"vary-normalise-lang-select": [
653+
"vary-normalize-lang-select": [
654654
"Assertion",
655655
"Response 2 does not come from cache"
656656
],
657-
"vary-normalise-lang-space": [
657+
"vary-normalize-lang-space": [
658658
"Assertion",
659659
"Response 2 does not come from cache"
660660
],
661-
"vary-normalise-space": [
661+
"vary-normalize-space": [
662662
"Assertion",
663663
"Response 2 does not come from cache"
664664
],

0 commit comments

Comments
 (0)