convert Body to our custom nopCloser in ServeHTTPForCache as well, re…

…cord RawResponse for cache hits

mw_redis_cache.go

@@ -231,6 +231,7 @@ func (m *RedisCacheMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Req
 	if err != nil {
 		log.Error("Could not create response object: ", err)
 	}
+	nopCloseResponseBody(newRes)
 
 	defer newRes.Body.Close()
 	for _, h := range hopHeaders {
@@ -263,7 +264,7 @@ func (m *RedisCacheMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Req
 
 	// Record analytics
 	if !m.Spec.DoNotTrack {
-		go m.sh.RecordHit(r, 0, newRes.StatusCode, nil)
+		go m.sh.RecordHit(r, 0, newRes.StatusCode, newRes)
 	}
 
 	// Stop any further execution

reverse_proxy.go

@@ -371,7 +371,11 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) *htt
 }
 
 func (p *ReverseProxy) ServeHTTPForCache(rw http.ResponseWriter, req *http.Request) *http.Response {
-	return p.WrappedServeHTTP(rw, req, true)
+	resp := p.WrappedServeHTTP(rw, req, true)
+
+	nopCloseResponseBody(resp)
+
+	return resp
 }
 
 func (p *ReverseProxy) CheckHardTimeoutEnforced(spec *APISpec, req *http.Request) (bool, int) {
@@ -890,11 +894,8 @@ func (n nopCloser) Read(p []byte) (int, error) {
 	return num, err
 }
 
-// Close is a no-op Close plus moves position to the start just in case
+// Close is a no-op Close
 func (n nopCloser) Close() error {
-	// seek to the start if body ever called to be closed
-	n.Seek(0, io.SeekStart)
-
 	return nil
 }