fix(issue-198): Support 304 response (#199)

darkweak · Apr 6, 2022 · bf3b204 · bf3b204
1 parent 896cb46
commit bf3b204
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/plugins/base.go b/plugins/base.go
@@ -62,7 +62,11 @@ func (r *CustomWriter) Send() (int, error) {
 		}
 	}
 	r.Rw.WriteHeader(r.Response.StatusCode)
-	b, _ := ioutil.ReadAll(r.Response.Body)
+	var b []byte
+
+	if r.Response.Body != nil {
+		b, _ = ioutil.ReadAll(r.Response.Body)
+	}
 	return r.Rw.Write(b)
 }
 

diff --git a/plugins/caddy/Caddyfile b/plugins/caddy/Caddyfile
@@ -70,6 +70,13 @@ route /cache-maxage {
     respond "Hello, max-age!"
 }
 
+route /not-modified {
+    cache {
+        ttl 5s
+    }
+    reverse_proxy 127.0.0.1:9000
+}
+
 route /no-reverse-proxy {
     cache
     reverse_proxy 127.0.0.1:9000

diff --git a/rfc/bridge.go b/rfc/bridge.go
@@ -116,6 +116,9 @@ func commonVaryMatchesVerification(cachedResp *http.Response, req *http.Request)
 // UpdateCacheEventually will handle Request and update the previous one in the cache provider
 func (t *VaryTransport) UpdateCacheEventually(req *http.Request) (*http.Response, error) {
 	if req.Response.Header.Get("Cache-Control") == "" && t.ConfigurationURL.DefaultCacheControl != "" {
+		if req.Response.Header == nil {
+			req.Response.Header = http.Header{}
+		}
 		req.Response.Header.Set("Cache-Control", t.ConfigurationURL.DefaultCacheControl)
 	}