Merge pull request #657 from ReneWerner87/improve_ctxIs

⚡ Improve ctx.Is performance
gofiber · Jul 21, 2020 · 6616950 · 6616950
2 parents 831d18d + 1211b15
commit 6616950
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/ctx.go b/ctx.go
@@ -523,12 +523,11 @@ func (ctx *Ctx) Is(extension string) bool {
 	if extensionHeader == "" {
 		return false
 	}
-	header := ctx.Get(HeaderContentType)
-	if factorSign := strings.IndexByte(header, ';'); factorSign != -1 {
-		header = header[:factorSign]
-	}
 
-	return utils.Trim(header, ' ') == extensionHeader
+	return strings.HasPrefix(
+		utils.TrimLeft(utils.GetString(ctx.Fasthttp.Request.Header.ContentType()), ' '),
+		extensionHeader,
+	)
 }
 
 // JSON converts any interface or string to JSON.

diff --git a/ctx_test.go b/ctx_test.go
@@ -748,6 +748,26 @@ func Test_Ctx_Is(t *testing.T) {
 	utils.AssertEqual(t, false, ctx.Is(".json"))
 	utils.AssertEqual(t, false, ctx.Is(""))
 	utils.AssertEqual(t, false, ctx.Is(".foooo"))
+
+	ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMEApplicationJSONCharsetUTF8)
+	utils.AssertEqual(t, false, ctx.Is("html"))
+	utils.AssertEqual(t, true, ctx.Is("json"))
+	utils.AssertEqual(t, true, ctx.Is(".json"))
+
+	ctx.Fasthttp.Request.Header.Set(HeaderContentType, " application/json;charset=UTF-8")
+	utils.AssertEqual(t, false, ctx.Is("html"))
+	utils.AssertEqual(t, true, ctx.Is("json"))
+	utils.AssertEqual(t, true, ctx.Is(".json"))
+
+	ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMEApplicationXMLCharsetUTF8)
+	utils.AssertEqual(t, false, ctx.Is("html"))
+	utils.AssertEqual(t, true, ctx.Is("xml"))
+	utils.AssertEqual(t, true, ctx.Is(".xml"))
+
+	ctx.Fasthttp.Request.Header.Set(HeaderContentType, MIMETextPlain)
+	utils.AssertEqual(t, false, ctx.Is("html"))
+	utils.AssertEqual(t, true, ctx.Is("txt"))
+	utils.AssertEqual(t, true, ctx.Is(".txt"))
 }
 
 // go test -v -run=^$ -bench=Benchmark_Ctx_Is -benchmem -count=4