PUBLIC_URL_DETECTION

Author: wxiaoguang

custom/conf/app.example.ini

@@ -74,7 +74,7 @@ RUN_USER = ; git
 ;; especially when the Gitea instance needs to be accessed in a container network.
 ;; * legacy: generate the public URL by "Host" header if "X-Forwarded-Proto" header exists, otherwise use "ROOT_URL".
 ;; * auto: always use "Host" header, and also use "X-Forwarded-Proto" header if it exists. If no "Host" header, use "ROOT_URL".
-;PUBLIC_URL_GENERATION = legacy
+;PUBLIC_URL_DETECTION = legacy
 ;;
 ;; For development purpose only. It makes Gitea handle sub-path ("/sub-path/owner/repo/...") directly when debugging without a reverse proxy.
 ;; DO NOT USE IT IN PRODUCTION!!!

modules/httplib/url.go

@@ -69,7 +69,7 @@ func GuessCurrentHostURL(ctx context.Context) string {
 	// 3. There is no reverse proxy.
 	// Without more information, Gitea is impossible to distinguish between case 2 and case 3, then case 2 would result in
 	// wrong guess like guessed public URL becomes "http://gitea:3000/" behind a "https" reverse proxy, which is not accessible by end users.
-	// So we introduced "PUBLIC_URL_GENERATION" option, to control the guessing behavior to satisfy different use cases.
+	// So we introduced "PUBLIC_URL_DETECTION" option, to control the guessing behavior to satisfy different use cases.
 	req, ok := ctx.Value(RequestContextKey).(*http.Request)
 	if !ok {
 		return strings.TrimSuffix(setting.AppURL, setting.AppSubURL+"/")

modules/setting/server.go

@@ -289,9 +289,9 @@ func loadServerFrom(rootCfg ConfigProvider) {
 
 	defaultAppURL := string(Protocol) + "://" + Domain + ":" + HTTPPort
 	AppURL = sec.Key("ROOT_URL").MustString(defaultAppURL)
-	PublicURLGeneration = sec.Key("PUBLIC_URL_GENERATION").MustString(PublicURLLegacy)
+	PublicURLGeneration = sec.Key("PUBLIC_URL_DETECTION").MustString(PublicURLLegacy)
 	if PublicURLGeneration != PublicURLAuto && PublicURLGeneration != PublicURLLegacy {
-		log.Fatal("Invalid PUBLIC_URL_GENERATION value: %s", PublicURLGeneration)
+		log.Fatal("Invalid PUBLIC_URL_DETECTION value: %s", PublicURLGeneration)
 	}
 
 	// Check validity of AppURL