From 08239bef6b1fa3a719b77b329b6570240c015d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=82=E6=B0=91233?= <mengrenxiong@gmail.com>
Date: Tue, 26 Oct 2021 18:15:29 +0800
Subject: [PATCH] fix the misplacement of adding slashes (#2847)

(cherry picked from commit 1c2aa59b20c8cff5b3c601708afe22100eac25e6)
---
 routes_test.go | 15 +++++++++++++++
 tree.go        |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/routes_test.go b/routes_test.go
index 036fa1c349..ffe3469e7c 100644
--- a/routes_test.go
+++ b/routes_test.go
@@ -481,6 +481,21 @@ func TestRouterNotFound(t *testing.T) {
 	router.GET("/a", func(c *Context) {})
 	w = performRequest(router, http.MethodGet, "/")
 	assert.Equal(t, http.StatusNotFound, w.Code)
+
+	// Reproduction test for the bug of issue #2843
+	router = New()
+	router.NoRoute(func(c *Context) {
+		if c.Request.RequestURI == "/login" {
+			c.String(200, "login")
+		}
+	})
+	router.GET("/logout", func(c *Context) {
+		c.String(200, "logout")
+	})
+	w = performRequest(router, http.MethodGet, "/login")
+	assert.Equal(t, "login", w.Body.String())
+	w = performRequest(router, http.MethodGet, "/logout")
+	assert.Equal(t, "logout", w.Body.String())
 }
 
 func TestRouterStaticFSNotFound(t *testing.T) {
diff --git a/tree.go b/tree.go
index f75e70a198..1ed1b33a2a 100644
--- a/tree.go
+++ b/tree.go
@@ -635,7 +635,8 @@ walk: // Outer loop for walking the tree
 		// Nothing found. We can recommend to redirect to the same URL with an
 		// extra trailing slash if a leaf exists for that path
 		value.tsr = path == "/" ||
-			(len(prefix) == len(path)+1 && n.handlers != nil)
+			(len(prefix) == len(path)+1 && prefix[len(path)] == '/' &&
+				path == prefix[:len(prefix)-1] && n.handlers != nil)
 		return
 	}
 }