mirror of
https://github.com/labstack/echo.git
synced 2024-12-24 20:14:31 +02:00
Set the Content-Encoding header earlier for Static
Static uses ServeContent, which looks to see if the Content-Encoding header is set or not to determine if it should set the Content-Length. If Content-Length is set by something it will be wrong after the gzip compression happens and stricter routers (and tools like curl) will have problems with the request. Fixes #806
This commit is contained in:
parent
a8b6864be3
commit
6f90742dec
@ -66,6 +66,7 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
|
||||
|
||||
res := c.Response()
|
||||
res.Header().Add(echo.HeaderVary, echo.HeaderAcceptEncoding)
|
||||
res.Header().Add(echo.HeaderContentEncoding, gzipScheme) // issue #806
|
||||
if strings.Contains(c.Request().Header.Get(echo.HeaderAcceptEncoding), gzipScheme) {
|
||||
rw := res.Writer
|
||||
w, err := gzip.NewWriterLevel(rw, config.Level)
|
||||
@ -92,8 +93,8 @@ func GzipWithConfig(config GzipConfig) echo.MiddlewareFunc {
|
||||
}
|
||||
|
||||
func (w *gzipResponseWriter) WriteHeader(code int) {
|
||||
if code != http.StatusNoContent { // Issue #489
|
||||
w.ResponseWriter.Header().Set(echo.HeaderContentEncoding, gzipScheme)
|
||||
if code == http.StatusNoContent { // Issue #489
|
||||
w.ResponseWriter.Header().Del(echo.HeaderContentEncoding)
|
||||
}
|
||||
w.ResponseWriter.WriteHeader(code)
|
||||
}
|
||||
|
@ -3,6 +3,7 @@ package middleware
|
||||
import (
|
||||
"bytes"
|
||||
"compress/gzip"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
@ -71,3 +72,29 @@ func TestGzipErrorReturned(t *testing.T) {
|
||||
assert.Equal(t, http.StatusNotFound, rec.Code)
|
||||
assert.Empty(t, rec.Header().Get(echo.HeaderContentEncoding))
|
||||
}
|
||||
|
||||
// Issue #806
|
||||
func TestGzipWithStatic(t *testing.T) {
|
||||
e := echo.New()
|
||||
e.Use(Gzip())
|
||||
e.Static("/test", "testdata/compress")
|
||||
req, _ := http.NewRequest(echo.GET, "/test/data", nil)
|
||||
req.Header.Set(echo.HeaderAcceptEncoding, gzipScheme)
|
||||
rec := httptest.NewRecorder()
|
||||
e.ServeHTTP(rec, req)
|
||||
assert.Equal(t, http.StatusOK, rec.Code)
|
||||
// Data is written out in chunks when Content-Length == "", so only
|
||||
// validate the content length if it's not set.
|
||||
if cl := rec.Header().Get("Content-Length"); cl != "" {
|
||||
assert.Equal(t, cl, rec.Body.Len())
|
||||
}
|
||||
r, err := gzip.NewReader(rec.Body)
|
||||
assert.NoError(t, err)
|
||||
defer r.Close()
|
||||
want, err := ioutil.ReadFile("testdata/compress/data")
|
||||
if assert.NoError(t, err) {
|
||||
var buf bytes.Buffer
|
||||
buf.ReadFrom(r)
|
||||
assert.Equal(t, want, buf.Bytes())
|
||||
}
|
||||
}
|
||||
|
1
middleware/testdata/compress/data
vendored
Normal file
1
middleware/testdata/compress/data
vendored
Normal file
@ -0,0 +1 @@
|
||||
test data
|
Loading…
Reference in New Issue
Block a user