From 5485e1334f634ae1b66b7db2e37d6e45ed892640 Mon Sep 17 00:00:00 2001
From: Maxgis <dahaoren777@gmail.com>
Date: Wed, 27 Jul 2016 09:31:53 +0800
Subject: [PATCH] remove not support encoding

---
 context/acceptencoder.go      | 15 ++++++++-------
 context/acceptencoder_test.go | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/context/acceptencoder.go b/context/acceptencoder.go
index cb735445..350b560d 100644
--- a/context/acceptencoder.go
+++ b/context/acceptencoder.go
@@ -209,9 +209,13 @@ func parseEncoding(r *http.Request) string {
 			continue
 		}
 		vs := strings.Split(v, ";")
+		var cf acceptEncoder
+		var ok bool
+		if cf, ok = encoderMap[vs[0]]; !ok {
+			continue
+		}
 		if len(vs) == 1 {
-			lastQ = q{vs[0], 1}
-			break
+			return cf.name
 		}
 		if len(vs) == 2 {
 			f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64)
@@ -219,12 +223,9 @@ func parseEncoding(r *http.Request) string {
 				continue
 			}
 			if f > lastQ.value {
-				lastQ = q{vs[0], f}
+				lastQ = q{cf.name, f}
 			}
 		}
 	}
-	if cf, ok := encoderMap[lastQ.name]; ok {
-		return cf.name
-	}
-	return ""
+	return lastQ.name
 }
diff --git a/context/acceptencoder_test.go b/context/acceptencoder_test.go
index 3afff679..e3d61e27 100644
--- a/context/acceptencoder_test.go
+++ b/context/acceptencoder_test.go
@@ -41,4 +41,19 @@ func Test_ExtractEncoding(t *testing.T) {
 	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"*"}}}) != "gzip" {
 		t.Fail()
 	}
+	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"x,gzip,deflate"}}}) != "gzip" {
+		t.Fail()
+	}
+	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip,x,deflate"}}}) != "gzip" {
+		t.Fail()
+	}
+	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip;q=0.5,x,deflate"}}}) != "deflate" {
+		t.Fail()
+	}
+	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"x"}}}) != "" {
+		t.Fail()
+	}
+	if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip;q=0.5,x;q=0.8"}}}) != "gzip" {
+		t.Fail()
+	}
 }