1
0
mirror of https://github.com/labstack/echo.git synced 2025-12-13 23:35:43 +02:00

Bug in gzip, fixed #95, #96.

Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2015-06-09 15:24:01 -07:00
parent 1ac5425ec4
commit ae721bd2b2
5 changed files with 41 additions and 15 deletions

View File

@@ -2,12 +2,15 @@ package middleware
import (
"compress/gzip"
"io"
"strings"
"net/http"
"bufio"
"net"
"github.com/labstack/echo"
"io"
)
type (
@@ -21,6 +24,18 @@ func (w gzipWriter) Write(b []byte) (int, error) {
return w.Writer.Write(b)
}
func (w gzipWriter) Flush() {
w.Writer.(*gzip.Writer).Flush()
}
func (w gzipWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
return w.ResponseWriter.(http.Hijacker).Hijack()
}
func (w *gzipWriter) CloseNotify() <-chan bool {
return w.ResponseWriter.(http.CloseNotifier).CloseNotify()
}
// Gzip returns a middleware which compresses HTTP response using gzip compression
// scheme.
func Gzip() echo.MiddlewareFunc {
@@ -28,16 +43,17 @@ func Gzip() echo.MiddlewareFunc {
return func(h echo.HandlerFunc) echo.HandlerFunc {
return func(c *echo.Context) error {
if (c.Request().Header.Get(echo.Upgrade)) != echo.WebSocket && // Skip for WebSocket
strings.Contains(c.Request().Header.Get(echo.AcceptEncoding), scheme) &&
c.Response().Status() != http.StatusNotFound { // Skip for "404 - Not Found"
if strings.Contains(c.Request().Header.Get(echo.AcceptEncoding), scheme) {
w := gzip.NewWriter(c.Response().Writer())
defer w.Close()
gw := gzipWriter{Writer: w, ResponseWriter: c.Response().Writer()}
c.Response().Header().Set(echo.ContentEncoding, scheme)
c.Response().SetWriter(gw)
}
return h(c)
if err := h(c); err != nil {
c.Error(err)
}
return nil
}
}
}