diff --git a/doc/h2load.1 b/doc/h2load.1 index e2d9b3de..a5e6b960 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "April 27, 2015" "0.7.13" "nghttp2" +.TH "H2LOAD" "1" "May 07, 2015" "0.7.14-DEV" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . @@ -205,12 +205,55 @@ The maximum time taken for request and response. The mean time taken for request and response. .TP .B sd -The standard deviation of the time for request and response. +The standard deviation of the time taken for request and response. .TP .B +/\- sd The fraction of the number of requests within standard deviation range (mean +/\- sd) against total number of successful requests. .UNINDENT +.TP +.B time for connect +.INDENT 7.0 +.TP +.B min +The minimum time taken to connect to a server. +.TP +.B max +The maximum time taken to connect to a server. +.TP +.B mean +The mean time taken to connect to a server. +.TP +.B sd +The standard deviation of the time taken to connect to a server. +.TP +.B +/\- sd +The fraction of the number of connections within standard +deviation range (mean +/\- sd) against total number of successful +connections. +.UNINDENT +.TP +.B time for 1st byte (of (decrypted in case of TLS) application data) +.INDENT 7.0 +.TP +.B min +The minimum time taken to get 1st byte from a server. +.TP +.B max +The maximum time taken to get 1st byte from a server. +.TP +.B mean +The mean time taken to get 1st byte from a server. +.TP +.B sd +The standard deviation of the time taken to get 1st byte from a +server. +.TP +.B +/\- sd +The fraction of the number of connections within standard +deviation range (mean +/\- sd) against total number of successful +connections. +.UNINDENT .UNINDENT .SH FLOW CONTROL .sp diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst index fc70f438..4dae19e7 100644 --- a/doc/h2load.1.rst +++ b/doc/h2load.1.rst @@ -153,11 +153,40 @@ time for request mean The mean time taken for request and response. sd - The standard deviation of the time for request and response. + The standard deviation of the time taken for request and response. +/- sd The fraction of the number of requests within standard deviation range (mean +/- sd) against total number of successful requests. +time for connect + min + The minimum time taken to connect to a server. + max + The maximum time taken to connect to a server. + mean + The mean time taken to connect to a server. + sd + The standard deviation of the time taken to connect to a server. + +/- sd + The fraction of the number of connections within standard + deviation range (mean +/- sd) against total number of successful + connections. + +time for 1st byte (of (decrypted in case of TLS) application data) + min + The minimum time taken to get 1st byte from a server. + max + The maximum time taken to get 1st byte from a server. + mean + The mean time taken to get 1st byte from a server. + sd + The standard deviation of the time taken to get 1st byte from a + server. + +/- sd + The fraction of the number of connections within standard + deviation range (mean +/- sd) against total number of successful + connections. + FLOW CONTROL ------------ diff --git a/doc/nghttp.1 b/doc/nghttp.1 index ae965c76..42e11d68 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "April 27, 2015" "0.7.13" "nghttp2" +.TH "NGHTTP" "1" "May 07, 2015" "0.7.14-DEV" "nghttp2" .SH NAME nghttp \- HTTP/2 experimental client . @@ -64,8 +64,9 @@ yet. .UNINDENT .INDENT 0.0 .TP -.B \-t, \-\-timeout= -Timeout each request after seconds. +.B \-t, \-\-timeout= +Timeout each request after . Set 0 to disable +timeout. .UNINDENT .INDENT 0.0 .TP @@ -215,6 +216,11 @@ Display this help and exit. .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 +is omitted, a second is used as unit. .SH DEPENDENCY BASED PRIORITY .sp nghttp sends priority hints to server by default unless @@ -269,7 +275,7 @@ to its resource type. .sp For CSS, and Javascript files inside "head" element, they depend on stream 3 with the weight 2. The Javascript files outside "head" -element depend on stream 5 with the weight 2. The images depend on +element depend on stream 5 with the weight 2. The mages depend on stream 11 with the weight 12. The other resources (e.g., icon) depend on stream 11 with the weight 2. .SH SEE ALSO diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index ff9fc95f..88cb8afd 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -38,9 +38,10 @@ OPTIONS 'index.html' is used as a filename. Not implemented yet. -.. option:: -t, --timeout= +.. option:: -t, --timeout= - Timeout each request after seconds. + Timeout each request after . Set 0 to disable + timeout. .. option:: -w, --window-bits= @@ -168,6 +169,11 @@ 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 +is omitted, a second is used as unit. + DEPENDENCY BASED PRIORITY ------------------------- diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index 086eb9df..ac453e64 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "April 27, 2015" "0.7.13" "nghttp2" +.TH "NGHTTPD" "1" "May 07, 2015" "0.7.14-DEV" "nghttp2" .SH NAME nghttpd \- HTTP/2 experimental server . @@ -119,6 +119,14 @@ Specify 0 to disable padding. .UNINDENT .INDENT 0.0 .TP +.B \-m, \-\-max\-concurrent\-streams= +Set the maximum number of the concurrent streams in one +HTTP/2 session. +.sp +Default: \fB100\fP +.UNINDENT +.INDENT 0.0 +.TP .B \-n, \-\-workers= Set the number of worker threads. .sp diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst index 77cc01d0..abb9c45a 100644 --- a/doc/nghttpd.1.rst +++ b/doc/nghttpd.1.rst @@ -85,6 +85,13 @@ OPTIONS Add at most bytes to a frame payload as padding. Specify 0 to disable padding. +.. option:: -m, --max-concurrent-streams= + + Set the maximum number of the concurrent streams in one + HTTP/2 session. + + Default: ``100`` + .. option:: -n, --workers= Set the number of worker threads. diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 8aa24018..e2ad5975 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "April 27, 2015" "0.7.13" "nghttp2" +.TH "NGHTTPX" "1" "May 07, 2015" "0.7.14-DEV" "nghttp2" .SH NAME nghttpx \- HTTP/2 experimental proxy . @@ -704,6 +704,23 @@ won\(aqt replace anything already set. This option can be used several times to specify multiple header fields. Example: \fI\%\-\-add\-response\-header\fP="foo: bar" .UNINDENT +.INDENT 0.0 +.TP +.B \-\-header\-field\-buffer= +Set maximum buffer size for incoming HTTP header field +list. This is the sum of header name and value in +bytes. +.sp +Default: \fB64K\fP +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-max\-header\-fields= +Set maximum number of incoming HTTP header fields, which +appear in one request or response header field list. +.sp +Default: \fB100\fP +.UNINDENT .SS Debug .INDENT 0.0 .TP diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index 99058a41..c4571d75 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -619,6 +619,21 @@ HTTP used several times to specify multiple header fields. Example: :option:`--add-response-header`\="foo: bar" +.. option:: --header-field-buffer= + + Set maximum buffer size for incoming HTTP header field + list. This is the sum of header name and value in + bytes. + + Default: ``64K`` + +.. option:: --max-header-fields= + + Set maximum number of incoming HTTP header fields, which + appear in one request or response header field list. + + Default: ``100`` + Debug ~~~~~