nghttpx: Use parameter instead of keyword for consistency

This commit is contained in:
Tatsuhiro Tsujikawa 2016-04-29 22:47:49 +09:00
parent 8e33f0a535
commit 3712c89a66
1 changed files with 11 additions and 11 deletions

View File

@ -1189,10 +1189,10 @@ void print_help(std::ostream &out) {
out << R"( out << R"(
<PRIVATE_KEY> <PRIVATE_KEY>
Set path to server's private key. Required unless Set path to server's private key. Required unless
"no-tls" keyword is used in --frontend option. "no-tls" parameter is used in --frontend option.
<CERT> Set path to server's certificate. Required unless <CERT> Set path to server's certificate. Required unless
"no-tls" keyword is used in --frontend option. To make "no-tls" parameter is used in --frontend option. To
OCSP stapling work, this must be an absolute path. make OCSP stapling work, this must be an absolute path.
Options: Options:
The options are categorized into several groups. The options are categorized into several groups.
@ -1272,7 +1272,7 @@ Connections:
value. Each parameter is described as follows. value. Each parameter is described as follows.
The backend application protocol can be specified using The backend application protocol can be specified using
optional "proto" keyword, and in the form of optional "proto" parameter, and in the form of
"proto=<PROTO>". All that share the same <PATTERN> must "proto=<PROTO>". All that share the same <PATTERN> must
have the same <PROTO> value if it is given. <PROTO> have the same <PROTO> value if it is given. <PROTO>
should be one of the following list without quotes: should be one of the following list without quotes:
@ -1281,8 +1281,8 @@ Connections:
over TLS. But in this option, it may mean HTTP/2 over over TLS. But in this option, it may mean HTTP/2 over
cleartext TCP unless "tls" keyword is used (see below). cleartext TCP unless "tls" keyword is used (see below).
TLS can be enabled by specifying optional "tls" keyword. TLS can be enabled by specifying optional "tls"
TLS is not enabled by default. parameter. TLS is not enabled by default.
With "sni=<SNI_HOST>" parameter, it can override the TLS With "sni=<SNI_HOST>" parameter, it can override the TLS
SNI field value with given <SNI_HOST>. This will SNI field value with given <SNI_HOST>. This will
@ -1320,7 +1320,7 @@ Connections:
multiple addresses. multiple addresses.
Optionally, TLS can be disabled by specifying "no-tls" Optionally, TLS can be disabled by specifying "no-tls"
keyword. TLS is enabled by default. parameter. TLS is enabled by default.
Default: *,3000 Default: *,3000
--backlog=<N> --backlog=<N>
@ -1576,7 +1576,7 @@ SSL/TLS:
"TLS SESSION TICKET RESUMPTION" section in manual page "TLS SESSION TICKET RESUMPTION" section in manual page
to know the data format in memcached entry. Optionally, to know the data format in memcached entry. Optionally,
memcached connection can be encrypted with TLS by memcached connection can be encrypted with TLS by
specifying "tls" keyword. specifying "tls" parameter.
--tls-ticket-key-memcached-address-family=(auto|IPv4|IPv6) --tls-ticket-key-memcached-address-family=(auto|IPv4|IPv6)
Specify address family of memcached connections to get Specify address family of memcached connections to get
TLS ticket keys. If "auto" is given, both IPv4 and IPv6 TLS ticket keys. If "auto" is given, both IPv4 and IPv6
@ -1625,7 +1625,7 @@ SSL/TLS:
cache. This enables shared session cache between cache. This enables shared session cache between
multiple nghttpx instances. Optionally, memcached multiple nghttpx instances. Optionally, memcached
connection can be encrypted with TLS by specifying "tls" connection can be encrypted with TLS by specifying "tls"
keyword. parameter.
--tls-session-cache-memcached-address-family=(auto|IPv4|IPv6) --tls-session-cache-memcached-address-family=(auto|IPv4|IPv6)
Specify address family of memcached connections to store Specify address family of memcached connections to store
session cache. If "auto" is given, both IPv4 and IPv6 session cache. If "auto" is given, both IPv4 and IPv6
@ -1716,8 +1716,8 @@ HTTP/2 and SPDY:
Mode: Mode:
(default mode) (default mode)
Accept HTTP/2, SPDY and HTTP/1.1 over SSL/TLS. "no-tls" Accept HTTP/2, SPDY and HTTP/1.1 over SSL/TLS. "no-tls"
keyword is used in --frontend option, accept HTTP/2 and parameter is used in --frontend option, accept HTTP/2
HTTP/1.1 over cleartext TCP. The incoming HTTP/1.1 and HTTP/1.1 over cleartext TCP. The incoming HTTP/1.1
connection can be upgraded to HTTP/2 through HTTP connection can be upgraded to HTTP/2 through HTTP
Upgrade. Upgrade.
-s, --http2-proxy -s, --http2-proxy