Merge branch 'master' into skip-fs-cache-based-on-config

client_timing_test.go

@@ -23,6 +23,14 @@ type fakeClientConn struct {
 	ch chan struct{}
 }
 
+func (c *fakeClientConn) SetWriteDeadline(t time.Time) error {
+	return nil
+}
+
+func (c *fakeClientConn) SetReadDeadline(t time.Time) error {
+	return nil
+}
+
 func (c *fakeClientConn) Write(b []byte) (int, error) {
 	c.ch <- struct{}{}
 	return len(b), nil

compress.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"os"
+	"io/fs"
 	"sync"
 
 	"github.com/klauspost/compress/flate"
@@ -421,7 +421,7 @@ func newCompressWriterPoolMap() []*sync.Pool {
 	return m
 }
 
-func isFileCompressible(f *os.File, minCompressRatio float64) bool {
+func isFileCompressible(f fs.File, minCompressRatio float64) bool {
 	// Try compressing the first 4kb of the file
 	// and see if it can be compressed by more than
 	// the given minCompressRatio.
@@ -433,7 +433,11 @@ func isFileCompressible(f *os.File, minCompressRatio float64) bool {
 	}
 	_, err := copyZeroAlloc(zw, lr)
 	releaseStacklessGzipWriter(zw, CompressDefaultCompression)
-	f.Seek(0, 0) //nolint:errcheck
+	seeker, ok := f.(io.Seeker)
+	if !ok {
+		return false
+	}
+	seeker.Seek(0, io.SeekStart) //nolint:errcheck
 	if err != nil {
 		return false
 	}