Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow access to internal ResponseWriter in gzhttp handler #799

Merged
merged 3 commits into from
Apr 5, 2023
Merged

Allow access to internal ResponseWriter in gzhttp handler #799

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bdc48d
add httprequest unwrapping
jgimenez Apr 3, 2023
df4f8bf
also for NoGzipResponseWriter
jgimenez Apr 3, 2023
b46a81d
add unwrap in newNoGzipResponseWriter with hijacker
jgimenez Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions gzhttp/compress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ func (w *GzipResponseWriter) Write(b []byte) (int, error) {
return len(b), nil
}

func (w *GzipResponseWriter) Unwrap() http.ResponseWriter {
return w.ResponseWriter
}

var castagnoliTable = crc32.MakeTable(crc32.Castagnoli)

// startGzip initializes a GZIP writer and writes the buffer.
Expand Down Expand Up @@ -919,6 +923,10 @@ func atoi(s string) (int, bool) {
return int(i64), err == nil
}

type unwrapper interface {
Unwrap() http.ResponseWriter
}

// newNoGzipResponseWriter will return a response writer that
// cleans up compression artifacts.
// Depending on whether http.Hijacker is supported the returned will as well.
Expand All @@ -929,10 +937,12 @@ func newNoGzipResponseWriter(w http.ResponseWriter) http.ResponseWriter {
http.ResponseWriter
http.Hijacker
http.Flusher
unwrapper
}{
ResponseWriter: n,
Hijacker: hj,
Flusher: n,
unwrapper: n,
}
return x
}
Expand Down Expand Up @@ -982,3 +992,7 @@ func (n *NoGzipResponseWriter) WriteHeader(statusCode int) {
}
n.ResponseWriter.WriteHeader(statusCode)
}

func (n *NoGzipResponseWriter) Unwrap() http.ResponseWriter {
return n.ResponseWriter
}