update redirect to reset path back to original to ensure logging middleware and alike records to correct original request URL

Author: joeybloggs

lars.go

@@ -296,13 +296,15 @@ func (l *LARS) serveHTTP(w http.ResponseWriter, r *http.Request) {
 			if l.redirectTrailingSlash && len(r.URL.Path) > 1 {
 
 				// find again all lowercase
-				lc := strings.ToLower(r.URL.Path)
+				orig := r.URL.Path
+				lc := strings.ToLower(orig)
 
 				if lc != r.URL.Path {
 
 					if c.handlers, _, _ = root.find(lc, c.params); c.handlers != nil {
 						r.URL.Path = lc
-						c.handlers = l.redirect(r.Method)
+						c.handlers = l.redirect(r.Method, r.URL.String())
+						r.URL.Path = orig
 						goto END
 					}
 				}
@@ -315,7 +317,8 @@ func (l *LARS) serveHTTP(w http.ResponseWriter, r *http.Request) {
 
 				if c.handlers, _, _ = root.find(lc, c.params); c.handlers != nil {
 					r.URL.Path = lc
-					c.handlers = l.redirect(r.Method)
+					c.handlers = l.redirect(r.Method, r.URL.String())
+					r.URL.Path = orig
 					goto END
 				}
 			}

util.go

@@ -113,7 +113,7 @@ func (l *LARS) wrapHandlerWithName(h Handler) (chain HandlerFunc, handlerName st
 	return
 }
 
-func (l *LARS) redirect(method string) (handlers HandlersChain) {
+func (l *LARS) redirect(method string, to string) (handlers HandlersChain) {
 
 	code := http.StatusMovedPermanently
 
@@ -123,7 +123,7 @@ func (l *LARS) redirect(method string) (handlers HandlersChain) {
 
 	fn := func(c Context) {
 		inCtx := c.BaseContext()
-		http.Redirect(inCtx.response, inCtx.request, inCtx.request.URL.String(), code)
+		http.Redirect(inCtx.response, inCtx.request, to, code)
 	}
 
 	hndlrs := make(HandlersChain, len(l.routeGroup.middleware)+1)