From e038625881d53b1269588bad51fbf734222278ed Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 8 Oct 2016 11:46:03 +0900 Subject: [PATCH] Update man pages --- doc/h2load.1 | 22 +++++++++++++++++++++- doc/h2load.1.rst | 18 ++++++++++++++++++ doc/nghttp.1 | 2 +- doc/nghttpd.1 | 2 +- doc/nghttpx.1 | 15 +++++++++++++-- doc/nghttpx.1.rst | 12 +++++++++++- 6 files changed, 65 insertions(+), 6 deletions(-) diff --git a/doc/h2load.1 b/doc/h2load.1 index 6811207b..24842a12 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "Sep 25, 2016" "1.15.0" "nghttp2" +.TH "H2LOAD" "1" "Oct 08, 2016" "1.16.0-DEV" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . @@ -242,6 +242,23 @@ http/1.1 for both http and https URI. .UNINDENT .INDENT 0.0 .TP +.B \-\-header\-table\-size= +Specify decoder header table size. +.sp +Default: \fB4K\fP +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-encoder\-header\-table\-size= +Specify encoder header table size. The decoder (server) +specifies the maximum dynamic table size it accepts. +Then the negotiated dynamic table size is the minimum of +this option value and the value which server specified. +.sp +Default: \fB4K\fP +.UNINDENT +.INDENT 0.0 +.TP .B \-v, \-\-verbose Output debug information. .UNINDENT @@ -256,6 +273,9 @@ Display version information and exit. Display this help and exit. .UNINDENT .sp +The argument is an integer and an optional unit (e.g., 10K is +10 * 1024). Units are K, M and G (powers of 1024). +.sp The argument is an integer and an optional unit (e.g., 1s is 1 second and 500ms is 500 milliseconds). Units are h, m, s or ms (hours, minutes, seconds and milliseconds, respectively). If a unit diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst index d059b81a..c3cbe657 100644 --- a/doc/h2load.1.rst +++ b/doc/h2load.1.rst @@ -202,6 +202,21 @@ OPTIONS :option:`--no-tls-proto`\=http/1.1, which effectively force http/1.1 for both http and https URI. +.. option:: --header-table-size= + + Specify decoder header table size. + + Default: ``4K`` + +.. option:: --encoder-header-table-size= + + Specify encoder header table size. The decoder (server) + specifies the maximum dynamic table size it accepts. + Then the negotiated dynamic table size is the minimum of + this option value and the value which server specified. + + Default: ``4K`` + .. option:: -v, --verbose Output debug information. @@ -216,6 +231,9 @@ OPTIONS +The argument is an integer and an optional unit (e.g., 10K is +10 * 1024). Units are K, M and G (powers of 1024). + The argument is an integer and an optional unit (e.g., 1s is 1 second and 500ms is 500 milliseconds). Units are h, m, s or ms (hours, minutes, seconds and milliseconds, respectively). If a unit diff --git a/doc/nghttp.1 b/doc/nghttp.1 index ddb04102..1aebe998 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "Sep 25, 2016" "1.15.0" "nghttp2" +.TH "NGHTTP" "1" "Oct 08, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttp \- HTTP/2 client . diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index a86d030e..03382039 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "Sep 25, 2016" "1.15.0" "nghttp2" +.TH "NGHTTPD" "1" "Oct 08, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttpd \- HTTP/2 server . diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index ba81ed56..18e50ca2 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "Sep 25, 2016" "1.15.0" "nghttp2" +.TH "NGHTTPX" "1" "Oct 08, 2016" "1.16.0-DEV" "nghttp2" .SH NAME nghttpx \- HTTP/2 proxy . @@ -509,6 +509,17 @@ described in OpenSSL ciphers(1). .UNINDENT .INDENT 0.0 .TP +.B \-\-ecdh\-curves= +Set supported curve list for frontend connections. + is a colon separated list of curve NID or names +in the preference order. The supported curves depend on +the linked OpenSSL library. This function requires +OpenSSL >= 1.0.2. +.sp +Default: \fBP\-256:P\-384:P\-521\fP +.UNINDENT +.INDENT 0.0 +.TP .B \-k, \-\-insecure Don\(aqt verify backend server\(aqs certificate if TLS is enabled for backend connections. @@ -1198,7 +1209,7 @@ backend server, the custom error pages are not used. .B \-\-server\-name= Change server response header field value to . .sp -Default: \fBnghttpx nghttp2/1.15.0\fP +Default: \fBnghttpx nghttp2/1.16.0\-DEV\fP .UNINDENT .INDENT 0.0 .TP diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index a0c31569..7c6dab0c 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -467,6 +467,16 @@ SSL/TLS Set allowed cipher list. The format of the string is described in OpenSSL ciphers(1). +.. option:: --ecdh-curves= + + Set supported curve list for frontend connections. + is a colon separated list of curve NID or names + in the preference order. The supported curves depend on + the linked OpenSSL library. This function requires + OpenSSL >= 1.0.2. + + Default: ``P-256:P-384:P-521`` + .. option:: -k, --insecure Don't verify backend server's certificate if TLS is @@ -1081,7 +1091,7 @@ HTTP Change server response header field value to . - Default: ``nghttpx nghttp2/1.15.0`` + Default: ``nghttpx nghttp2/1.16.0-DEV`` .. option:: --no-server-rewrite