Merge branch 'main' of https://github.com/go-gitea/gitea

zjj · zjj · commit d3dbab04f046 · 2022-01-22T23:12:41.000+08:00
* 'main' of https://github.com/go-gitea/gitea: Fix route wrap (go-gitea#18360)
diff --git a/modules/web/wrap_convert.go b/modules/web/wrap_convert.go
@@ -93,6 +93,9 @@ func convertHandler(handler interface{}) wrappedHandlerFunc {
 			}
 			routing.UpdateFuncInfo(req.Context(), funcInfo)
 			t(next).ServeHTTP(resp, req)
+			if r, ok := resp.(context.ResponseWriter); ok && r.Status() > 0 {
+				done = true
+			}
 			return
 		}
 	default:

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ func convertHandler(handler interface{}) wrappedHandlerFunc {`
`93`	`93`	`}`
`94`	`94`	`routing.UpdateFuncInfo(req.Context(), funcInfo)`
`95`	`95`	`t(next).ServeHTTP(resp, req)`
	`96`	`+ if r, ok := resp.(context.ResponseWriter); ok && r.Status() > 0 {`
	`97`	`+ done = true`
	`98`	`+ }`
`96`	`99`	`return`
`97`	`100`	`}`
`98`	`101`	`default:`