pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-24 22:06:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into issue115

Browse source
This commit is contained in:
6543 2022-11-12 21:17:22 +01:00
commit bbf85590c4
No known key found for this signature in database
GPG key ID: C99B82E40B027BAE
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
server/handler/handler.go
View file

@ -16,6 +16,7 @@ import (
const ( const (
headerAccessControlAllowOrigin = "Access-Control-Allow-Origin" headerAccessControlAllowOrigin = "Access-Control-Allow-Origin"
headerAccessControlAllowMethods = "Access-Control-Allow-Methods" headerAccessControlAllowMethods = "Access-Control-Allow-Methods"
defaultPagesRepo = "pages"
) )
// Handler handles a single HTTP request to the web server. // Handler handles a single HTTP request to the web server.

2
server/handler/handler_sub_domain.go
View file

@ -15,8 +15,6 @@ import (
"codeberg.org/codeberg/pages/server/upstream" "codeberg.org/codeberg/pages/server/upstream"
) )
const defaultPagesRepo = "pages"
func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gitea.Client, func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gitea.Client,
mainDomainSuffix string, mainDomainSuffix string,
defaultPagesBranches []string, defaultPagesBranches []string,

2
server/handler/try.go
View file

@ -24,7 +24,7 @@ func tryUpstream(ctx *context.Context, giteaClient *gitea.Client,
canonicalDomain, _ := options.CheckCanonicalDomain(giteaClient, "", string(mainDomainSuffix), canonicalDomainCache) canonicalDomain, _ := options.CheckCanonicalDomain(giteaClient, "", string(mainDomainSuffix), canonicalDomainCache)
if !strings.HasSuffix(strings.SplitN(canonicalDomain, "/", 2)[0], string(mainDomainSuffix)) { if !strings.HasSuffix(strings.SplitN(canonicalDomain, "/", 2)[0], string(mainDomainSuffix)) {
canonicalPath := ctx.Req.RequestURI canonicalPath := ctx.Req.RequestURI
if options.TargetRepo != "pages" { if options.TargetRepo != defaultPagesRepo {
path := strings.SplitN(canonicalPath, "/", 3) path := strings.SplitN(canonicalPath, "/", 3)
if len(path) >= 3 { if len(path) >= 3 {
canonicalPath = "/" + path[2] canonicalPath = "/" + path[2]