Merge 585a6c484bb36904838414858ea7b5b6aa10d458 into d1a15347b1e45a8ee816193d3578a93bfd73b70f

.github/workflows/gin.yml

@@ -65,7 +65,7 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ matrix.go-build }}

context.go

@@ -989,8 +989,7 @@ func (c *Context) ClientIP() string {
 
 	if trusted && c.engine.ForwardedByClientIP && c.engine.RemoteIPHeaders != nil {
 		for _, headerName := range c.engine.RemoteIPHeaders {
-			headerValue := strings.Join(c.Request.Header.Values(headerName), ",")
-			ip, valid := c.engine.validateHeader(headerValue)
+			ip, valid := c.engine.validateHeader(c.requestHeader(headerName))
 			if valid {
 				return ip
 			}

context_test.go

@@ -1143,37 +1143,6 @@ func TestContextRenderNoContentIndentedJSON(t *testing.T) {
 	assert.Equal(t, "application/json; charset=utf-8", w.Header().Get("Content-Type"))
 }
 
-func TestContextClientIPWithMultipleHeaders(t *testing.T) {
-	c, _ := CreateTestContext(httptest.NewRecorder())
-	c.Request, _ = http.NewRequest(http.MethodGet, "/test", nil)
-
-	// Multiple X-Forwarded-For headers
-	c.Request.Header.Add("X-Forwarded-For", "1.2.3.4, "+localhostIP)
-	c.Request.Header.Add("X-Forwarded-For", "5.6.7.8")
-	c.Request.RemoteAddr = localhostIP + ":1234"
-
-	c.engine.ForwardedByClientIP = true
-	c.engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
-	_ = c.engine.SetTrustedProxies([]string{localhostIP})
-
-	// Should return 5.6.7.8 (last non-trusted IP)
-	assert.Equal(t, "5.6.7.8", c.ClientIP())
-}
-
-func TestContextClientIPWithSingleHeader(t *testing.T) {
-	c, _ := CreateTestContext(httptest.NewRecorder())
-	c.Request, _ = http.NewRequest(http.MethodGet, "/test", nil)
-	c.Request.Header.Set("X-Forwarded-For", "1.2.3.4, "+localhostIP)
-	c.Request.RemoteAddr = localhostIP + ":1234"
-
-	c.engine.ForwardedByClientIP = true
-	c.engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
-	_ = c.engine.SetTrustedProxies([]string{localhostIP})
-
-	// Should return 1.2.3.4
-	assert.Equal(t, "1.2.3.4", c.ClientIP())
-}
-
 // Tests that the response is serialized as Secure JSON
 // and Content-Type is set to application/json
 func TestContextRenderSecureJSON(t *testing.T) {
@@ -1941,7 +1910,7 @@ func TestContextClientIP(t *testing.T) {
 	resetContextForClientIPTests(c)
 
 	// IPv6 support
-	c.Request.RemoteAddr = fmt.Sprintf("[%s]:12345", localhostIPv6)
+	c.Request.RemoteAddr = "[::1]:12345"
 	assert.Equal(t, "20.20.20.20", c.ClientIP())
 
 	resetContextForClientIPTests(c)
@@ -3243,7 +3212,7 @@ func TestContextCopyShouldNotCancel(t *testing.T) {
 	}()
 
 	addr := strings.Split(l.Addr().String(), ":")
-	res, err := http.Get(fmt.Sprintf("http://%s:%s/", localhostIP, addr[len(addr)-1]))
+	res, err := http.Get(fmt.Sprintf("http://127.0.0.1:%s/", addr[len(addr)-1]))
 	if err != nil {
 		t.Error(fmt.Errorf("request error: %w", err))
 		return

gin_test.go

@@ -83,7 +83,7 @@ func TestLoadHTMLGlobDebugMode(t *testing.T) {
 }
 
 func TestH2c(t *testing.T) {
-	ln, err := net.Listen("tcp", localhostIP+":0")
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Error(err)
 	}

response_writer.go

@@ -128,9 +128,7 @@ func (w *responseWriter) CloseNotify() <-chan bool {
 // Flush implements the http.Flusher interface.
 func (w *responseWriter) Flush() {
 	w.WriteHeaderNow()
-	if f, ok := w.ResponseWriter.(http.Flusher); ok {
-		f.Flush()
-	}
+	w.ResponseWriter.(http.Flusher).Flush()
 }
 
 func (w *responseWriter) Pusher() (pusher http.Pusher) {

utils.go

@@ -19,12 +19,6 @@ import (
 // BindKey indicates a default bind key.
 const BindKey = "_gin-gonic/gin/bindkey"
 
-// localhostIP indicates the default localhost IP address.
-const localhostIP = "127.0.0.1"
-
-// localhostIPv6 indicates the default localhost IPv6 address.
-const localhostIPv6 = "::1"
-
 // Bind is a helper function for given interface object and returns a Gin middleware.
 func Bind(val any) HandlerFunc {
 	value := reflect.ValueOf(val)