GOMODULES
/
fiber
mirror of https://github.com/gofiber/fiber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to text/javascript as per RFC9239 (#2146) 

* Switch to text/javascript as per RFC9239

* Add deprecated flag to application/javascript
pull/2150/head
Soham Sen 2022-10-10 17:59:51 +05:30 committed by GitHub
parent 925d5d03dc
commit 9a6002056c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctx.go
View File

@ -813,7 +813,7 @@ func (c *Ctx) JSONP(data interface{}, callback ...string) error {
result = cb + "(" + c.app.getString(raw) + ");" result = cb + "(" + c.app.getString(raw) + ");"
c.setCanonical(HeaderXContentTypeOptions, "nosniff") c.setCanonical(HeaderXContentTypeOptions, "nosniff")
c.fasthttp.Response.Header.SetContentType(MIMEApplicationJavaScriptCharsetUTF8) c.fasthttp.Response.Header.SetContentType(MIMETextJavaScriptCharsetUTF8)
return c.SendString(result) return c.SendString(result)
} }

4
ctx_test.go
View File

@ -2399,7 +2399,7 @@ func Test_Ctx_JSONP(t *testing.T) {
}) })
utils.AssertEqual(t, nil, err) utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, `callback({"Age":20,"Name":"Grame"});`, string(c.Response().Body())) utils.AssertEqual(t, `callback({"Age":20,"Name":"Grame"});`, string(c.Response().Body()))
utils.AssertEqual(t, "application/javascript; charset=utf-8", string(c.Response().Header.Peek("content-type"))) utils.AssertEqual(t, "text/javascript; charset=utf-8", string(c.Response().Header.Peek("content-type")))
err = c.JSONP(Map{ err = c.JSONP(Map{
"Name": "Grame", "Name": "Grame",
@ -2407,7 +2407,7 @@ func Test_Ctx_JSONP(t *testing.T) {
}, "john") }, "john")
utils.AssertEqual(t, nil, err) utils.AssertEqual(t, nil, err)
utils.AssertEqual(t, `john({"Age":20,"Name":"Grame"});`, string(c.Response().Body())) utils.AssertEqual(t, `john({"Age":20,"Name":"Grame"});`, string(c.Response().Body()))
utils.AssertEqual(t, "application/javascript; charset=utf-8", string(c.Response().Header.Peek("content-type"))) utils.AssertEqual(t, "text/javascript; charset=utf-8", string(c.Response().Header.Peek("content-type")))
} }
// go test -v -run=^$ -bench=Benchmark_Ctx_JSONP -benchmem -count=4 // go test -v -run=^$ -bench=Benchmark_Ctx_JSONP -benchmem -count=4

24
helpers.go
View File

@ -385,21 +385,25 @@ const (
// MIME types that are commonly used // MIME types that are commonly used
const ( const (
MIMETextXML = "text/xml" MIMETextXML = "text/xml"
MIMETextHTML = "text/html" MIMETextHTML = "text/html"
MIMETextPlain = "text/plain" MIMETextPlain = "text/plain"
MIMEApplicationXML = "application/xml" MIMETextJavaScript = "text/javascript"
MIMEApplicationJSON = "application/json" MIMEApplicationXML = "application/xml"
MIMEApplicationJSON = "application/json"
// Deprecated: use MIMETextJavaScript instead
MIMEApplicationJavaScript = "application/javascript" MIMEApplicationJavaScript = "application/javascript"
MIMEApplicationForm = "application/x-www-form-urlencoded" MIMEApplicationForm = "application/x-www-form-urlencoded"
MIMEOctetStream = "application/octet-stream" MIMEOctetStream = "application/octet-stream"
MIMEMultipartForm = "multipart/form-data" MIMEMultipartForm = "multipart/form-data"
MIMETextXMLCharsetUTF8 = "text/xml; charset=utf-8" MIMETextXMLCharsetUTF8 = "text/xml; charset=utf-8"
MIMETextHTMLCharsetUTF8 = "text/html; charset=utf-8" MIMETextHTMLCharsetUTF8 = "text/html; charset=utf-8"
MIMETextPlainCharsetUTF8 = "text/plain; charset=utf-8" MIMETextPlainCharsetUTF8 = "text/plain; charset=utf-8"
MIMEApplicationXMLCharsetUTF8 = "application/xml; charset=utf-8" MIMETextJavaScriptCharsetUTF8 = "text/javascript; charset=utf-8"
MIMEApplicationJSONCharsetUTF8 = "application/json; charset=utf-8" MIMEApplicationXMLCharsetUTF8 = "application/xml; charset=utf-8"
MIMEApplicationJSONCharsetUTF8 = "application/json; charset=utf-8"
// Deprecated: use MIMETextJavaScriptCharsetUTF8 instead
MIMEApplicationJavaScriptCharsetUTF8 = "application/javascript; charset=utf-8" MIMEApplicationJavaScriptCharsetUTF8 = "application/javascript; charset=utf-8"
) )

3
utils/http.go
View File

@ -134,6 +134,7 @@ var statusMessage = []string{
// MIME types were copied from https://github.com/nginx/nginx/blob/67d2a9541826ecd5db97d604f23460210fd3e517/conf/mime.types with the following updates: // MIME types were copied from https://github.com/nginx/nginx/blob/67d2a9541826ecd5db97d604f23460210fd3e517/conf/mime.types with the following updates:
// - Use "application/xml" instead of "text/xml" as recommended per https://datatracker.ietf.org/doc/html/rfc7303#section-4.1 // - Use "application/xml" instead of "text/xml" as recommended per https://datatracker.ietf.org/doc/html/rfc7303#section-4.1
// - Use "text/javascript" instead of "application/javascript" as recommended per https://www.rfc-editor.org/rfc/rfc9239#name-text-javascript
var mimeExtensions = map[string]string{ var mimeExtensions = map[string]string{
"html": "text/html", "html": "text/html",
"htm": "text/html", "htm": "text/html",
@ -143,7 +144,7 @@ var mimeExtensions = map[string]string{
"gif": "image/gif", "gif": "image/gif",
"jpeg": "image/jpeg", "jpeg": "image/jpeg",
"jpg": "image/jpeg", "jpg": "image/jpeg",
"js": "application/javascript", "js": "text/javascript",
"atom": "application/atom+xml", "atom": "application/atom+xml",
"rss": "application/rss+xml", "rss": "application/rss+xml",
"mml": "text/mathml", "mml": "text/mathml",