Skip to content

Commit

Permalink
gzhttp: Return http.HandlerFunc instead of http.Handler (#406)
Browse files Browse the repository at this point in the history
`http.HandlerFunc` is more flexible and offers the `http.Handler` interface.

Very lightly breaking change.
  • Loading branch information
klauspost committed Jul 9, 2021
1 parent 09f13c9 commit e9c9800
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions gzhttp/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ func (w *GzipResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
var _ http.Hijacker = &GzipResponseWriter{}

var onceDefault sync.Once
var defaultWrapper func(http.Handler) http.Handler
var defaultWrapper func(http.Handler) http.HandlerFunc

// GzipHandler allows to easily wrap an http handler with default settings.
func GzipHandler(h http.Handler) http.Handler {
func GzipHandler(h http.Handler) http.HandlerFunc {
onceDefault.Do(func() {
var err error
defaultWrapper, err = NewWrapper()
Expand All @@ -335,7 +335,7 @@ func GzipHandler(h http.Handler) http.Handler {
var grwPool = sync.Pool{New: func() interface{} { return &GzipResponseWriter{} }}

// NewWrapper returns a reusable wrapper with the supplied options.
func NewWrapper(opts ...option) (func(http.Handler) http.Handler, error) {
func NewWrapper(opts ...option) (func(http.Handler) http.HandlerFunc, error) {
c := &config{
level: gzip.DefaultCompression,
minSize: DefaultMinSize,
Expand All @@ -354,8 +354,8 @@ func NewWrapper(opts ...option) (func(http.Handler) http.Handler, error) {
return nil, err
}

return func(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
return func(h http.Handler) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Add(vary, acceptEncoding)
if acceptsGzip(r) {
gw := grwPool.Get().(*GzipResponseWriter)
Expand Down Expand Up @@ -383,11 +383,10 @@ func NewWrapper(opts ...option) (func(http.Handler) http.Handler, error) {
} else {
h.ServeHTTP(gw, r)
}

} else {
h.ServeHTTP(w, r)
}
})
}
}, nil
}

Expand Down

0 comments on commit e9c9800

Please sign in to comment.