re
/
gin
forked from mirror/gin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #200 from joiggama/feature/content-type-charset 

Specify utf-8 as default on content type charset headers on renderers
This commit is contained in:
Javier Provecho Fernandez 2015-02-07 14:38:21 +01:00
parent bdf54b7fa2 b69dde8e68
commit a5ec533a6a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
context_test.go
View File

@ -76,7 +76,7 @@ func TestContextJSON(t *testing.T) {
t.Errorf("Response should be {\"foo\":\"bar\"}, was: %s", w.Body.String()) t.Errorf("Response should be {\"foo\":\"bar\"}, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "application/json" { if w.HeaderMap.Get("Content-Type") != "application/json; charset=utf-8" {
t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }
@ -103,7 +103,7 @@ func TestContextHTML(t *testing.T) {
t.Errorf("Response should be Hello alexandernyquist, was: %s", w.Body.String()) t.Errorf("Response should be Hello alexandernyquist, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "text/html" { if w.HeaderMap.Get("Content-Type") != "text/html; charset=utf-8" {
t.Errorf("Content-Type should be text/html, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be text/html, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }
@ -125,7 +125,7 @@ func TestContextString(t *testing.T) {
t.Errorf("Response should be test, was: %s", w.Body.String()) t.Errorf("Response should be test, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "text/plain" { if w.HeaderMap.Get("Content-Type") != "text/plain; charset=utf-8" {
t.Errorf("Content-Type should be text/plain, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be text/plain, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }
@ -147,7 +147,7 @@ func TestContextXML(t *testing.T) {
t.Errorf("Response should be <map><foo>bar</foo></map>, was: %s", w.Body.String()) t.Errorf("Response should be <map><foo>bar</foo></map>, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "application/xml" { if w.HeaderMap.Get("Content-Type") != "application/xml; charset=utf-8" {
t.Errorf("Content-Type should be application/xml, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be application/xml, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }
@ -336,7 +336,7 @@ func TestBindingJSON(t *testing.T) {
t.Errorf("Response should be {\"parsed\":\"bar\"}, was: %s", w.Body.String()) t.Errorf("Response should be {\"parsed\":\"bar\"}, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "application/json" { if w.HeaderMap.Get("Content-Type") != "application/json; charset=utf-8" {
t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }
@ -369,7 +369,7 @@ func TestBindingJSONEncoding(t *testing.T) {
t.Errorf("Response should be {\"parsed\":\"嘉\"}, was: %s", w.Body.String()) t.Errorf("Response should be {\"parsed\":\"嘉\"}, was: %s", w.Body.String())
} }
if w.HeaderMap.Get("Content-Type") != "application/json" { if w.HeaderMap.Get("Content-Type") != "application/json; charset=utf-8" {
t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type")) t.Errorf("Content-Type should be application/json, was %s", w.HeaderMap.Get("Content-Type"))
} }
} }

2
render/render.go
View File

@ -50,7 +50,7 @@ var (
) )
func writeHeader(w http.ResponseWriter, code int, contentType string) { func writeHeader(w http.ResponseWriter, code int, contentType string) {
w.Header().Set("Content-Type", contentType) w.Header().Set("Content-Type", contentType+"; charset=utf-8")
w.WriteHeader(code) w.WriteHeader(code)
} }