From 78046e5137dfbcbe0398a33ae9fd48d7edb2912d Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 31 Mar 2023 23:35:48 +0800
Subject: [PATCH] Fix incorrect CORS failure detection logic (#23844)
Regression of #23495
Fixes #23838
Fixes #23850
---
modules/public/public.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/public/public.go b/modules/public/public.go
index 30b03a2795..2c96cf9e76 100644
--- a/modules/public/public.go
+++ b/modules/public/public.go
@@ -45,15 +45,15 @@ func AssetsHandlerFunc(opts *Options) http.HandlerFunc {
return
}
- var corsSent bool
if opts.CorsHandler != nil {
+ var corsSent bool
opts.CorsHandler(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
corsSent = true
})).ServeHTTP(resp, req)
- }
- // If CORS is not sent, the response must have been written by other handlers
- if !corsSent {
- return
+ // If CORS is not sent, the response must have been written by other handlers
+ if !corsSent {
+ return
+ }
}
file := req.URL.Path[len(opts.Prefix):]