From b989a6e26900e13938c8ce8fc5a9c2e454291951 Mon Sep 17 00:00:00 2001
From: Notealot <714804968@qq.com>
Date: Wed, 29 Sep 2021 19:26:02 +0800
Subject: [PATCH] Quick Fix c.ClientIP() mistakely parsing to 127.0.0.1 for who
 not using r.Run() to run http server (#2832)

(cherry picked from commit 6d75aba83f7733d505b830bbe224583f1ef3771e)
---
 gin.go             | 4 ++--
 middleware_test.go | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gin.go b/gin.go
index 9af932a304..383f7970ce 100644
--- a/gin.go
+++ b/gin.go
@@ -168,6 +168,7 @@ func New() *Engine {
 		trees:                  make(methodTrees, 0, 9),
 		delims:                 render.Delims{Left: "{{", Right: "}}"},
 		secureJSONPrefix:       "while(1);",
+		trustedCIDRs:           []*net.IPNet{{IP: net.IP{0x0, 0x0, 0x0, 0x0}, Mask: net.IPMask{0x0, 0x0, 0x0, 0x0}}},
 	}
 	engine.RouterGroup.engine = engine
 	engine.pool.New = func() interface{} {
@@ -249,9 +250,8 @@ func (engine *Engine) NoRoute(handlers ...HandlerFunc) {
 	engine.rebuild404Handlers()
 }
 
-// NoMethod sets the handlers called when NoMethod.
+// NoMethod sets the handlers called when Engine.HandleMethodNotAllowed = true.
 func (engine *Engine) NoMethod(handlers ...HandlerFunc) {
-	engine.HandleMethodNotAllowed = true
 	engine.noMethod = handlers
 	engine.rebuild405Handlers()
 }
diff --git a/middleware_test.go b/middleware_test.go
index fca1c530b3..4b4afd4af0 100644
--- a/middleware_test.go
+++ b/middleware_test.go
@@ -118,7 +118,10 @@ func TestMiddlewareNoMethodEnabled(t *testing.T) {
 func TestMiddlewareNoMethodDisabled(t *testing.T) {
 	signature := ""
 	router := New()
+
+	// NoMethod disabled
 	router.HandleMethodNotAllowed = false
+
 	router.Use(func(c *Context) {
 		signature += "A"
 		c.Next()
@@ -144,6 +147,7 @@ func TestMiddlewareNoMethodDisabled(t *testing.T) {
 	router.POST("/", func(c *Context) {
 		signature += " XX "
 	})
+
 	// RUN
 	w := performRequest(router, "GET", "/")