mirror of
https://github.com/dokku/dokku.git
synced 2026-08-29 10:08:53 +02:00
fix: nginx-vhosts globalValue returns raw global for timeout properties
The nginx-property binary's globalValue() switch returned ComputedX for client-body-timeout, client-header-timeout, keepalive-timeout, and lingering-timeout, leaking the per-app value into nginx:report's global-<prop> key. Other properties in the same switch already call GlobalX. Aligns the four with the rest. Also tightens tests/unit/nginx-vhosts_properties.bats so the helper preserves values containing whitespace or literal \$ across the inner /bin/bash -c, and switches proxy-keepalive to integer values since the set subcommand validates it via is_number.
This commit is contained in:
@@ -184,9 +184,9 @@ func globalValue(appName string, property string) string {
|
||||
case "bind-address-ipv6":
|
||||
value = nginx_vhosts.GlobalBindAddressIPv6()
|
||||
case "client-body-timeout":
|
||||
value = nginx_vhosts.ComputedClientBodyTimeout(appName)
|
||||
value = nginx_vhosts.GlobalClientBodyTimeout()
|
||||
case "client-header-timeout":
|
||||
value = nginx_vhosts.ComputedClientHeaderTimeout(appName)
|
||||
value = nginx_vhosts.GlobalClientHeaderTimeout()
|
||||
case "client-max-body-size":
|
||||
value = nginx_vhosts.GlobalClientMaxBodySize()
|
||||
case "disable-custom-config":
|
||||
@@ -202,9 +202,9 @@ func globalValue(appName string, property string) string {
|
||||
case "hsts":
|
||||
value = nginx_vhosts.GlobalHSTS()
|
||||
case "keepalive-timeout":
|
||||
value = nginx_vhosts.ComputedKeepaliveTimeout(appName)
|
||||
value = nginx_vhosts.GlobalKeepaliveTimeout()
|
||||
case "lingering-timeout":
|
||||
value = nginx_vhosts.ComputedLingeringTimeout(appName)
|
||||
value = nginx_vhosts.GlobalLingeringTimeout()
|
||||
case "nginx-conf-sigil-path":
|
||||
value = nginx_vhosts.GlobalNginxConfSigilPath()
|
||||
case "nginx-service-command":
|
||||
|
||||
Reference in New Issue
Block a user