vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6436 from LiamHaworth/bugfix/6433-support-for-charset-in-content-type-header 

etcdserver, api, v2http, client: Added support for semicolons
release-3.1
Xiang Li 2016-09-14 23:25:31 -05:00 committed by GitHub
parent e77baa3dcb 5cfa9e2384
commit b3a083d336
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/api/v2http/client.go
View File

@ -761,6 +761,10 @@ func trimErrorPrefix(err error, prefix string) error {
func unmarshalRequest(r *http.Request, req json.Unmarshaler, w http.ResponseWriter) bool {
ctype := r.Header.Get("Content-Type")
semicolonPosition := strings.Index(ctype, ";")
if semicolonPosition != -1 {
ctype = strings.TrimSpace(strings.ToLower(ctype[0:semicolonPosition]))
}
if ctype != "application/json" {
writeError(w, r, httptypes.NewHTTPError(http.StatusUnsupportedMediaType, fmt.Sprintf("Bad Content-Type %s, accept application/json", ctype)))
return false