fix(cache): refactored warning removal into main file

zkat · Apr 1, 2017 · 5b0a9f9 · 5b0a9f9
1 parent 5b74cbc
commit 5b0a9f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cache.js b/cache.js
@@ -105,11 +105,6 @@ module.exports = class Cache {
   put (req, response) {
     const size = response.headers.get('content-length')
     const fitInMemory = !!size && size < MAX_MEM_SIZE
-    const warningCode = (response.headers.get('Warning') || '').match(/^\d+/)
-    if (warningCode && +warningCode >= 100 && +warningCode < 200) {
-      // https://tools.ietf.org/html/rfc7234#section-4.3.4
-      response.headers.delete('Warning')
-    }
     const opts = {
       metadata: {
         url: req.url,

diff --git a/index.js b/index.js
@@ -47,6 +47,13 @@ function cachingFetch (uri, _opts) {
       headers: opts.headers
     })
     return opts.cacheManager.match(req, opts.cacheOpts).then(res => {
+      if (res) {
+        const warningCode = (res.headers.get('Warning') || '').match(/^\d+/)
+        if (warningCode && +warningCode >= 100 && +warningCode < 200) {
+          // https://tools.ietf.org/html/rfc7234#section-4.3.4
+          res.headers.delete('Warning')
+        }
+      }
       if (res && opts.cache === 'default' && !isStale(res)) {
         return res
       } else if (res && (opts.cache === 'default' || opts.cache === 'no-cache')) {