Merge branch 'jub0bs-master'

rs · Feb 9, 2024 · af821ae · af821ae
2 parents 9297f15 + 0bcf73f
commit af821ae
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -106,15 +106,15 @@ See [API documentation](http://godoc.org/github.com/rs/cors) for more info.
 goos: darwin
 goarch: arm64
 pkg: github.com/rs/cors
-BenchmarkWithout-10             352671961       3.317 ns/op       0 B/op       0 allocs/op
-BenchmarkDefault-10              18261723       65.63 ns/op       0 B/op       0 allocs/op
-BenchmarkAllowedOrigin-10        13309591       90.21 ns/op       0 B/op       0 allocs/op
-BenchmarkPreflight-10             7247728       166.9 ns/op       0 B/op       0 allocs/op
-BenchmarkPreflightHeader-10       5915437       202.9 ns/op       0 B/op       0 allocs/op
-BenchmarkWildcard/match-10      250336476       4.784 ns/op       0 B/op       0 allocs/op
-BenchmarkWildcard/too_short-10 1000000000       0.6354 ns/op       0 B/op       0 allocs/op
+BenchmarkWithout-10            	135325480	         8.124 ns/op	       0 B/op	       0 allocs/op
+BenchmarkDefault-10            	24082140	        51.40 ns/op	       0 B/op	       0 allocs/op
+BenchmarkAllowedOrigin-10      	16424518	        88.25 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPreflight-10          	 8010259	       147.3 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPreflightHeader-10    	 6850962	       175.0 ns/op	       0 B/op	       0 allocs/op
+BenchmarkWildcard/match-10     	253275342	         4.714 ns/op	       0 B/op	       0 allocs/op
+BenchmarkWildcard/too_short-10 	1000000000	         0.6235 ns/op	       0 B/op	       0 allocs/op
 PASS
-ok  	github.com/rs/cors	9.613s
+ok  	github.com/rs/cors	99.131s
 ```
 
 ## Licenses

diff --git a/bench_test.go b/bench_test.go
@@ -29,33 +29,31 @@ const (
 )
 
 func BenchmarkWithout(b *testing.B) {
-	res := FakeResponse{http.Header{}}
+	resps := makeFakeResponses(b.N)
 	req, _ := http.NewRequest(http.MethodGet, dummyEndpoint, nil)
 
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		clear(res.header)
-		testHandler.ServeHTTP(res, req)
+		testHandler.ServeHTTP(resps[i], req)
 	}
 }
 
 func BenchmarkDefault(b *testing.B) {
-	res := FakeResponse{http.Header{}}
+	resps := makeFakeResponses(b.N)
 	req, _ := http.NewRequest(http.MethodGet, dummyEndpoint, nil)
 	req.Header.Add(headerOrigin, dummyOrigin)
 	handler := Default().Handler(testHandler)
 
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		clear(res.header)
-		handler.ServeHTTP(res, req)
+		handler.ServeHTTP(resps[i], req)
 	}
 }
 
 func BenchmarkAllowedOrigin(b *testing.B) {
-	res := FakeResponse{http.Header{}}
+	resps := makeFakeResponses(b.N)
 	req, _ := http.NewRequest(http.MethodGet, dummyEndpoint, nil)
 	req.Header.Add(headerOrigin, dummyOrigin)
 	c := New(Options{
@@ -66,13 +64,12 @@ func BenchmarkAllowedOrigin(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		clear(res.header)
-		handler.ServeHTTP(res, req)
+		handler.ServeHTTP(resps[i], req)
 	}
 }
 
 func BenchmarkPreflight(b *testing.B) {
-	res := FakeResponse{http.Header{}}
+	resps := makeFakeResponses(b.N)
 	req, _ := http.NewRequest(http.MethodOptions, dummyEndpoint, nil)
 	req.Header.Add(headerOrigin, dummyOrigin)
 	req.Header.Add(headerACRM, http.MethodGet)
@@ -81,13 +78,12 @@ func BenchmarkPreflight(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		clear(res.header)
-		handler.ServeHTTP(res, req)
+		handler.ServeHTTP(resps[i], req)
 	}
 }
 
 func BenchmarkPreflightHeader(b *testing.B) {
-	res := FakeResponse{http.Header{}}
+	resps := makeFakeResponses(b.N)
 	req, _ := http.NewRequest(http.MethodOptions, dummyEndpoint, nil)
 	req.Header.Add(headerOrigin, dummyOrigin)
 	req.Header.Add(headerACRM, http.MethodGet)
@@ -97,13 +93,16 @@ func BenchmarkPreflightHeader(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		clear(res.header)
-		handler.ServeHTTP(res, req)
+		handler.ServeHTTP(resps[i], req)
 	}
 }
 
-func clear(h http.Header) {
-	for k := range h {
-		delete(h, k)
+func makeFakeResponses(n int) []*FakeResponse {
+	resps := make([]*FakeResponse, n)
+	for i := 0; i < n; i++ {
+		resps[i] = &FakeResponse{http.Header{
+			"Content-Type": []string{"text/plain"},
+		}}
 	}
+	return resps
 }
diff --git a/cors.go b/cors.go
@@ -394,10 +394,10 @@ func (c *Cors) handleActualRequest(w http.ResponseWriter, r *http.Request) {
 	allowed, additionalVaryHeaders := c.isOriginAllowed(r, origin)
 
 	// Always set Vary, see https://github.com/rs/cors/issues/10
-	if vary, found := headers["Vary"]; found {
-		headers["Vary"] = append(vary, headerVaryOrigin[0])
-	} else {
+	if vary := headers["Vary"]; vary == nil {
 		headers["Vary"] = headerVaryOrigin
+	} else {
+		headers["Vary"] = append(vary, headerVaryOrigin[0])
 	}
 	if len(additionalVaryHeaders) > 0 {
 		headers.Add("Vary", strings.Join(convert(additionalVaryHeaders, http.CanonicalHeaderKey), ", "))