diff --git a/doc/h2load.1 b/doc/h2load.1 index 566c7e36..7284b598 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "February 27, 2015" "0.7.5" "nghttp2" +.TH "H2LOAD" "1" "March 14, 2015" "0.7.7" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 223337ee..a9d0ac78 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "February 27, 2015" "0.7.5" "nghttp2" +.TH "NGHTTP" "1" "March 14, 2015" "0.7.7" "nghttp2" .SH NAME nghttp \- HTTP/2 experimental client . @@ -101,6 +101,14 @@ Add a header to the requests. Example: \fI\%\-H\fP\(aq:method: PUT\(aq .UNINDENT .INDENT 0.0 .TP +.B \-\-trailer=
+Add a trailer header to the requests.
must not +include pseudo header field (header field name starting +with \(aq:\(aq). To send trailer, one must use \fI\-d\fP option to +send request body. Example: \fI\-\-trailer\fP \(aqfoo: bar\(aq. +.UNINDENT +.INDENT 0.0 +.TP .B \-\-cert= Use the specified client certificate file. The file must be in PEM format. diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index 77ef39b9..9e89608f 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -67,6 +67,13 @@ OPTIONS Add a header to the requests. Example: :option:`-H`\':method: PUT' +.. option:: --trailer=
+ + Add a trailer header to the requests.
must not + include pseudo header field (header field name starting + with ':'). To send trailer, one must use :option:`-d` option to + send request body. Example: :option:`--trailer` 'foo: bar'. + .. option:: --cert= Use the specified client certificate file. The file diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index dd8b1e17..316da417 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "February 27, 2015" "0.7.5" "nghttp2" +.TH "NGHTTPD" "1" "March 14, 2015" "0.7.7" "nghttp2" .SH NAME nghttpd \- HTTP/2 experimental server . @@ -144,6 +144,14 @@ rather than complete request is received. .UNINDENT .INDENT 0.0 .TP +.B \-\-trailer=
+Add a trailer header to a response.
must not +include pseudo header field (header field name starting +with \(aq:\(aq). The trailer is sent only if a response has +body part. Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq. +.UNINDENT +.INDENT 0.0 +.TP .B \-\-version Display version information and exit. .UNINDENT diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst index 1eb1cf15..0cfb5097 100644 --- a/doc/nghttpd.1.rst +++ b/doc/nghttpd.1.rst @@ -104,6 +104,13 @@ OPTIONS Start sending response when request HEADERS is received, rather than complete request is received. +.. option:: --trailer=
+ + Add a trailer header to a response.
must not + include pseudo header field (header field name starting + with ':'). The trailer is sent only if a response has + body part. Example: :option:`--trailer` 'foo: bar'. + .. option:: --version Display version information and exit. diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 38cb5606..9f0479a2 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "February 27, 2015" "0.7.5" "nghttp2" +.TH "NGHTTPX" "1" "March 14, 2015" "0.7.7" "nghttp2" .SH NAME nghttpx \- HTTP/2 experimental proxy . @@ -55,13 +55,10 @@ The options are categorized into several groups. .INDENT 0.0 .TP .B \-b, \-\-backend= -Set backend host and port. For HTTP/1 backend, multiple -backend addresses are accepted by repeating this option. -HTTP/2 backend does not support multiple backend -addresses and the first occurrence of this option is -used. UNIX domain socket can be specified by prefixing -path name with "unix:" (e.g., -unix:/var/run/backend.sock) +Set backend host and port. The multiple backend +addresses are accepted by repeating this option. UNIX +domain socket can be specified by prefixing path name +with "unix:" (e.g., unix:/var/run/backend.sock) .sp Default: \fB127.0.0.1,80\fP .UNINDENT @@ -196,6 +193,13 @@ Default: \fB0\fP .UNINDENT .INDENT 0.0 .TP +.B \-\-backend\-http2\-connections\-per\-worker= +Set maximum number of HTTP/2 connections per worker. +The default value is 0, which means the number of +backend addresses specified by \fI\%\-b\fP option. +.UNINDENT +.INDENT 0.0 +.TP .B \-\-backend\-http1\-connections\-per\-host= Set maximum number of backend concurrent HTTP/1 connections per host. This option is meaningful when \fI\%\-s\fP diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index 6c5b457f..d3f5feb4 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -34,13 +34,10 @@ Connections .. option:: -b, --backend= - Set backend host and port. For HTTP/1 backend, multiple - backend addresses are accepted by repeating this option. - HTTP/2 backend does not support multiple backend - addresses and the first occurrence of this option is - used. UNIX domain socket can be specified by prefixing - path name with "unix:" (e.g., - unix:/var/run/backend.sock) + Set backend host and port. The multiple backend + addresses are accepted by repeating this option. UNIX + domain socket can be specified by prefixing path name + with "unix:" (e.g., unix:/var/run/backend.sock) Default: ``127.0.0.1,80`` @@ -161,6 +158,12 @@ Performance Default: ``0`` +.. option:: --backend-http2-connections-per-worker= + + Set maximum number of HTTP/2 connections per worker. + The default value is 0, which means the number of + backend addresses specified by :option:`-b` option. + .. option:: --backend-http1-connections-per-host= Set maximum number of backend concurrent HTTP/1