Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move FCGI req.URL.Path fix-up to the FCGI listener #15292

Merged
merged 6 commits into from
Apr 9, 2021
Merged

Move FCGI req.URL.Path fix-up to the FCGI listener #15292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eca7276
Move FCGI req.URL.Path fix-up to the FCGI listener
zeripath Apr 5, 2021
668482e
Merge branch 'master' into simplify-fcgi-requrl-path-fixing
zeripath Apr 6, 2021
60ad84d
Merge branch 'master' into simplify-fcgi-requrl-path-fixing
zeripath Apr 6, 2021
52ac137
Merge branch 'master' into simplify-fcgi-requrl-path-fixing
zeripath Apr 7, 2021
3d0b0c5
Merge branch 'master' into simplify-fcgi-requrl-path-fixing
6543 Apr 9, 2021
ece2e0d
Merge branch 'master' into simplify-fcgi-requrl-path-fixing
zeripath Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cmd/web_graceful.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
"net"
"net/http"
"net/http/fcgi"
"strings"

"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)

func runHTTP(network, listenAddr, name string, m http.Handler) error {
Expand Down Expand Up @@ -48,7 +50,12 @@ func runFCGI(network, listenAddr, name string, m http.Handler) error {
fcgiServer := graceful.NewServer(network, listenAddr, name)

err := fcgiServer.ListenAndServe(func(listener net.Listener) error {
return fcgi.Serve(listener, m)
return fcgi.Serve(listener, http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
if setting.AppSubURL != "" {
req.URL.Path = strings.TrimPrefix(req.URL.Path, setting.AppSubURL)
}
m.ServeHTTP(resp, req)
}))
})
if err != nil {
log.Fatal("Failed to start FCGI main server: %v", err)
Expand Down
9 changes: 0 additions & 9 deletions routers/routes/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,6 @@ func WebRoutes() *web.Route {
r.Use(h)
}

if (setting.Protocol == setting.FCGI || setting.Protocol == setting.FCGIUnix) && setting.AppSubURL != "" {
r.Use(func(next http.Handler) http.Handler {
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
req.URL.Path = strings.TrimPrefix(req.URL.Path, setting.AppSubURL)
next.ServeHTTP(resp, req)
})
})
}

mailer.InitMailRender(templates.Mailer())

if setting.Service.EnableCaptcha {
Expand Down