diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-15 17:22:25 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-15 17:22:25 -0400 |
| commit | 59cd12c6d2cea932f3133e6cb2bf710262be3f57 (patch) | |
| tree | a6fd8e8d94ea73fca66ff174f038e5cce0901fa8 /man | |
| parent | 4c00fa533f99ed1b17fa14d33e2fd42c54c45bea (diff) | |
| download | cups-59cd12c6d2cea932f3133e6cb2bf710262be3f57.tar.gz | |
Add UserAgentTokens config directive (Issue #5555)
cups/cups-private.h:
- Add enum and value for UserAgentTokens directive.
cups/usersys.c:
- _cups_finalize_conf(): Copy UserAgentTokens value to globals.
- _cups_init_conf(): Set default UserAgentTokens value and grab prefs.
- _cups_read_conf(): Look for UserAgentTokens value.
- _cups_set_uatokens(): Set UserAgentTokens value.
- cupsSetUserAgent(): Support UserAgentTokens values.
Diffstat (limited to 'man')
| -rw-r--r-- | man/client.conf.man.in | 26 | ||||
| -rw-r--r-- | man/cupsd.conf.man.in | 14 |
2 files changed, 31 insertions, 9 deletions
diff --git a/man/client.conf.man.in b/man/client.conf.man.in index cb93160fc..f30f0a7fe 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -6,7 +6,7 @@ .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" -.TH client.conf 5 "CUPS" "3 November 2017" "Apple Inc." +.TH client.conf 5 "CUPS" "15 April 2019" "Apple Inc." .SH NAME client.conf \- client configuration file for cups .SH DESCRIPTION @@ -76,6 +76,30 @@ The default is "Yes". .TP 5 \fBUser \fIname\fR Specifies the default user name to use for requests. +.\"#UserAgentTokens +.TP 5 +\fBUserAgentTokens None\fR +.TP 5 +\fBUserAgentTokens ProductOnly\fR +.TP 5 +\fBUserAgentTokens Major\fR +.TP 5 +\fBUserAgentTokens Minor\fR +.TP 5 +\fBUserAgentTokens Minimal\fR +.TP 5 +\fBUserAgentTokens OS\fR +.TP 5 +\fBUserAgentTokens Full\fR +Specifies what information is included in the User-Agent header of HTTP requests. +"None" disables the User-Agent header. +"ProductOnly" reports "CUPS". +"Major" reports "CUPS/major IPP/2". +"Minor" reports "CUPS/major.minor IPP/2.1". +"Minimal" reports "CUPS/major.minor.patch IPP/2.1". +"OS" reports "CUPS/major.minor.path (osname osversion) IPP/2.1". +"Full" reports "CUPS/major.minor.path (osname osversion; architecture) IPP/2.1". +The default is "Minimal". .TP 5 \fBValidateCerts Yes\fR .TP 5 diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index c9b5a287b..cea1cbdbe 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -7,7 +7,7 @@ .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cupsd.conf 5 "CUPS" "8 November 2018" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "15 April 2019" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -418,13 +418,11 @@ command. Specifies what information is included in the Server header of HTTP responses. "None" disables the Server header. "ProductOnly" reports "CUPS". -"Major" reports "CUPS 2". -"Minor" reports "CUPS 2.0". -"Minimal" reports "CUPS 2.0.0". -"OS" reports "CUPS 2.0.0 (UNAME)" where UNAME is the output of the -.BR uname (1) -command. -"Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0". +"Major" reports "CUPS/major IPP/2". +"Minor" reports "CUPS/major.minor IPP/2.1". +"Minimal" reports "CUPS/major.minor.patch IPP/2.1". +"OS" reports "CUPS/major.minor.path (osname osversion) IPP/2.1". +"Full" reports "CUPS/major.minor.path (osname osversion; architecture) IPP/2.1". The default is "Minimal". .\"#SSLListen .TP 5 |