From 66ae2a435c93a4dad4bd57dc2e1fdcf5f73efedc Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Tue, 19 May 2020 17:04:00 +0200
Subject: [PATCH 1/2] Add TrimTrailingSlashes option

---
 router.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/router.go b/router.go
index f53b4ca..d869fc6 100644
--- a/router.go
+++ b/router.go
@@ -38,6 +38,7 @@ type Router struct {
 	NotFoundHandler         Handle
 	MethodNotAllowedHandler Handle
 	ErrorHandler            ErrorHandle
+	TrimTrailingSlashes     bool
 	server                  *http.Server
 }
 
@@ -127,7 +128,7 @@ func (r *Router) Stop() error {
 	return err
 }
 
-func (r *Router) getHttpr() *httprouter.Router {
+func (r *Router) getHttpr() http.Handler {
 	httpr := httprouter.New()
 
 	for _, v := range r.routes {
@@ -156,6 +157,18 @@ func (r *Router) getHttpr() *httprouter.Router {
 		r.ErrorHandler(c, err)
 	}
 
+	if r.TrimTrailingSlashes {
+		httpr.RedirectTrailingSlash = false
+
+		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			l := len(req.URL.Path)
+			if l > 1 && req.URL.Path[l-1] == '/' {
+				req.URL.Path = req.URL.Path[:l-1]
+			}
+			httpr.ServeHTTP(w, req)
+		})
+	}
+
 	return httpr
 }
 

From 283c75b32e971b100c8aa7c25c0a448f682d77d5 Mon Sep 17 00:00:00 2001
From: Elwin Tamminga <elwintamminga@gmail.com>
Date: Tue, 20 Jul 2021 10:49:55 +0200
Subject: [PATCH 2/2] Remove port when using headers in c.RealIP
 Co-authored-by: Elwin Tamminga <elwintamminga@gmail.com> Co-committed-by:
 Elwin Tamminga <elwintamminga@gmail.com>

---
 context.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/context.go b/context.go
index eec329c..e9c2fd6 100644
--- a/context.go
+++ b/context.go
@@ -105,14 +105,17 @@ func (c *Context) Get(key string) interface{} {
 
 // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
 func (c *Context) RealIP() string {
+	reqIP := c.Request.RemoteAddr
+
 	if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` {
-		return strings.Split(ip, `, `)[0]
+		reqIP = strings.Split(ip, `, `)[0]
+	} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
+		reqIP = ip
 	}
 
-	if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-		return ip
+	ra, _, _ := net.SplitHostPort(reqIP)
+	if ra != `` {
+		reqIP = ra
 	}
-
-	ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
-	return ra
+	return reqIP
 }