From 495f9b2d354c9f01f0ed04c9f7413c42b77053cf Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Thu, 25 Apr 2024 10:06:20 +0200
Subject: [PATCH] Disable zstd middleware

---
 http/middleware/zstd/zstd.go | 12 ++++++------
 http/server.go               |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/http/middleware/zstd/zstd.go b/http/middleware/zstd/zstd.go
index 39fff71c..d18542cd 100644
--- a/http/middleware/zstd/zstd.go
+++ b/http/middleware/zstd/zstd.go
@@ -194,15 +194,15 @@ func (w *zstdResponseWriter) Write(b []byte) (int, error) {
 				w.ResponseWriter.WriteHeader(w.code)
 			}
 
-			//return w.Encoder.Write(w.buffer.Bytes())
-			return w.ResponseWriter.Write(w.Encoder.EncodeAll(w.buffer.Bytes(), nil))
+			return w.Encoder.Write(w.buffer.Bytes())
+			//return w.ResponseWriter.Write(w.Encoder.EncodeAll(w.buffer.Bytes(), nil))
 		} else {
 			return n, err
 		}
 	}
 
-	//return w.Encoder.Write(b)
-	return w.ResponseWriter.Write(w.Encoder.EncodeAll(b, nil))
+	return w.Encoder.Write(b)
+	//return w.ResponseWriter.Write(w.Encoder.EncodeAll(b, nil))
 }
 
 func (w *zstdResponseWriter) Flush() {
@@ -214,8 +214,8 @@ func (w *zstdResponseWriter) Flush() {
 			w.ResponseWriter.WriteHeader(w.code)
 		}
 
-		//w.Encoder.Write(w.buffer.Bytes())
-		w.ResponseWriter.Write(w.Encoder.EncodeAll(w.buffer.Bytes(), nil))
+		w.Encoder.Write(w.buffer.Bytes())
+		//w.ResponseWriter.Write(w.Encoder.EncodeAll(w.buffer.Bytes(), nil))
 	}
 
 	w.Encoder.Flush()
diff --git a/http/server.go b/http/server.go
index 4ba1da54..33e2fbe4 100644
--- a/http/server.go
+++ b/http/server.go
@@ -66,7 +66,6 @@ import (
 	mwmime "github.com/datarhei/core/v16/http/middleware/mime"
 	mwredirect "github.com/datarhei/core/v16/http/middleware/redirect"
 	mwsession "github.com/datarhei/core/v16/http/middleware/session"
-	mwzstd "github.com/datarhei/core/v16/http/middleware/zstd"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
@@ -490,11 +489,6 @@ func (s *server) setRoutes() {
 		MinLength: 1000,
 		Skipper:   mwgzip.ContentTypeSkipper(nil),
 	})
-	zstdMiddleware := mwzstd.NewWithConfig(mwzstd.Config{
-		Level:     mwzstd.BestSpeed,
-		MinLength: 1000,
-		Skipper:   mwzstd.ContentTypeSkipper(nil),
-	})
 
 	// API router grouo
 	api := s.router.Group("/api")
@@ -599,7 +593,6 @@ func (s *server) setRoutes() {
 	// APIv3 router group
 	v3 := api.Group("/v3")
 
-	v3.Use(zstdMiddleware)
 	v3.Use(gzipMiddleware)
 
 	s.setRoutesV3(v3)