Fix GH-14474: Better document remote user in PHP-FPM access.format (#14521)

bukka · web-flow · commit 7c32704a71f6 · 2024-06-16T12:32:00.000+01:00
diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in
@@ -348,7 +348,7 @@ pm.max_spare_servers = 3
 ;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
 ;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-;  %u: remote user
+;  %u: basic auth user if specified in Authorization header
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"
 ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ pm.max_spare_servers = 3`
`348`	`348`	`; %d/%b/%Y:%H:%M:%S %z (default)`
`349`	`349`	`; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag`
`350`	`350`	`; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t`
`351`		`-; %u: remote user`
	`351`	`+; %u: basic auth user if specified in Authorization header`
`352`	`352`	`;`
`353`	`353`	`; Default: "%R - %u %t \"%m %r\" %s"`
`354`	`354`	`;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"`