lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-29 13:11:29 +00:00
Code Issues Releases Activity

Merge pull request #2065 from Maxgis/issue_accept_encoding

Browse Source 
remove not support encoding
This commit is contained in:
astaxie 2016-07-27 14:13:13 +08:00 committed by GitHub
commit 909afa9352
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
context/acceptencoder.go
View File

@ -209,9 +209,13 @@ func parseEncoding(r *http.Request) string {
continue continue
} }
vs := strings.Split(v, ";") vs := strings.Split(v, ";")
var cf acceptEncoder
var ok bool
if cf, ok = encoderMap[vs[0]]; !ok {
continue
}
if len(vs) == 1 { if len(vs) == 1 {
lastQ = q{vs[0], 1} return cf.name
break
} }
if len(vs) == 2 { if len(vs) == 2 {
f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64) f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64)
@ -219,12 +223,9 @@ func parseEncoding(r *http.Request) string {
continue continue
} }
if f > lastQ.value { if f > lastQ.value {
lastQ = q{vs[0], f} lastQ = q{cf.name, f}
} }
} }
} }
if cf, ok := encoderMap[lastQ.name]; ok { return lastQ.name
return cf.name
}
return ""
} }

15
context/acceptencoder_test.go
View File

@ -41,4 +41,19 @@ func Test_ExtractEncoding(t *testing.T) {
if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"*"}}}) != "gzip" { if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"*"}}}) != "gzip" {
t.Fail() 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()
}
} }