From c293444dc83670a61d53f5c1f035ec9d649abaa2 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 21 May 2021 03:10:17 +0900
Subject: [PATCH] fix(transport): disable avif when png (#462)

---
 transport.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/transport.go b/transport.go
index 4da871dd..f5a3b374 100644
--- a/transport.go
+++ b/transport.go
@@ -72,14 +72,14 @@ func (t *Transport) makeRequest(r *http.Request) (*http.Request, error) {
 	return r2, nil
 }
 
-func scanAcceptHeader(r *http.Request) string {
+func scanAcceptHeader(r *http.Request, t string) string {
 	f := os.Getenv("MANAEL_ENABLE_AVIF")
 	a := r.Header.Get("Accept")
 
 	for _, v := range strings.Split(a, ",") {
 		t := strings.TrimSpace(v)
 
-		if f == "true" && strings.HasPrefix(t, "image/avif") {
+		if f == "true" && t != "image/png" && strings.HasPrefix(t, "image/avif") {
 			return "image/avif"
 		} else if strings.HasPrefix(t, "image/webp") {
 			return "image/webp"
@@ -112,7 +112,7 @@ func check(w *http.Response, r *http.Request) string {
 		return "*/*"
 	}
 
-	return scanAcceptHeader(r)
+	return scanAcceptHeader(r, t)
 }
 
 func convert(src io.Reader, t string) (*bytes.Buffer, error) {