Merge 4857f7c66e into e46bd52185

fix lint

context.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/gin-contrib/sse"
+
 	"github.com/gin-gonic/gin/binding"
 	"github.com/gin-gonic/gin/render"
 )
@@ -71,9 +72,6 @@ type Context struct {
 	// This mutex protects Keys map.
 	mu sync.RWMutex
 
-	// This mutex protects headers map
-	hmu sync.RWMutex
-
 	// Keys is a key/value pair exclusively for the context of each request.
 	Keys map[string]any
 
@@ -986,8 +984,8 @@ func (c *Context) Status(code int) {
 // It writes a header in the response.
 // If value == "", this method removes the header `c.Writer.Header().Del(key)`
 func (c *Context) Header(key, value string) {
-	c.hmu.Lock()
+	c.mu.Lock()
-	defer c.hmu.Unlock()
+	defer c.mu.Unlock()
 	if value == "" {
 		c.Writer.Header().Del(key)
 		return
@@ -997,8 +995,8 @@ func (c *Context) Header(key, value string) {
 
 // GetHeader returns value from request headers.
 func (c *Context) GetHeader(key string) string {
-	c.hmu.RLock()
+	c.mu.RLock()
-	defer c.hmu.RUnlock()
+	defer c.mu.RUnlock()
 	return c.requestHeader(key)
 }
 

context_test.go

@@ -27,11 +27,12 @@ import (
 	"time"
 
 	"github.com/gin-contrib/sse"
-	"github.com/gin-gonic/gin/binding"
-	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
+
+	"github.com/gin-gonic/gin/binding"
+	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 )
 
 var _ context.Context = (*Context)(nil)