diff --git a/doc/h2load.1 b/doc/h2load.1 index 6eebe239..98d69216 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH H2LOAD "1" "December 2014" "h2load nghttp2/0.6.8-DEV" "User Commands" +.TH H2LOAD "1" "January 2015" "h2load nghttp2/0.7.0" "User Commands" .SH NAME h2load \- HTTP/2 benchmarking tool .SH SYNOPSIS diff --git a/doc/nghttp.1 b/doc/nghttp.1 index f96eaade..205d8a9c 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH NGHTTP "1" "December 2014" "nghttp nghttp2/0.6.8-DEV" "User Commands" +.TH NGHTTP "1" "January 2015" "nghttp nghttp2/0.7.0" "User Commands" .SH NAME nghttp \- HTTP/2 experimental client .SH SYNOPSIS @@ -113,6 +113,10 @@ Don't send content\-length header field. Don't send dependency based priority hint to server. .TP +\fB\-\-dep\-idle\fR +Use idle streams as anchor nodes to express +priority. +.TP \fB\-\-version\fR Display version information and exit. .TP diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index 965e0dc3..de8c4208 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -171,6 +171,12 @@ OPTIONS Don't send dependency based priority hint to server. +.. option:: --dep-idle + + + Use idle streams as anchor nodes to express + priority. + .. option:: --version diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index dd1df922..580486a9 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH NGHTTPD "1" "December 2014" "nghttpd nghttp2/0.6.8-DEV" "User Commands" +.TH NGHTTPD "1" "January 2015" "nghttpd nghttp2/0.7.0" "User Commands" .SH NAME nghttpd \- HTTP/2 experimental server .SH SYNOPSIS diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index ac21ddc0..e0926084 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH NGHTTPX "1" "December 2014" "nghttpx nghttp2/0.6.8-DEV" "User Commands" +.TH NGHTTPX "1" "January 2015" "nghttpx nghttp2/0.7.0" "User Commands" .SH NAME nghttpx \- HTTP/2 experimental proxy .SH SYNOPSIS @@ -39,7 +39,7 @@ Default: '*,3000' \fB\-\-backlog=\fR Set listen backlog size. If \fB\-1\fR is given, libevent will choose suitable value. -Default: \fB\-1\fR +Default: 128 .TP \fB\-\-backend\-ipv4\fR Resolve backend hostname to IPv4 address only. @@ -76,11 +76,9 @@ Default: 0 .TP \fB\-\-read\-burst=\fR Set maximum read burst size on frontend -connection. Setting 0 does not work, but it is -not a problem because \fB\-\-read\-rate\fR=\fI\,0\/\fR will give -unlimited read rate regardless of this option -value. -Default: 1073741824 +connection. Setting 0 to this option means read +burst size is unlimited. +Default: 0 .TP \fB\-\-write\-rate=\fR Set maximum average write rate on frontend @@ -97,25 +95,29 @@ Default: 0 \fB\-\-worker\-read\-rate=\fR Set maximum average read rate on frontend connection per worker. Setting 0 to this option -means read rate is unlimited. +means read rate is unlimited. Not implemented +yet. Default: 0 .TP \fB\-\-worker\-read\-burst=\fR Set maximum read burst size on frontend connection per worker. Setting 0 to this option -means read burst size is unlimited. +means read burst size is unlimited. Not +implemented yet. Default: 0 .TP \fB\-\-worker\-write\-rate=\fR Set maximum average write rate on frontend connection per worker. Setting 0 to this option -means write rate is unlimited. +means write rate is unlimited. Not implemented +yet. Default: 0 .TP \fB\-\-worker\-write\-burst=\fR Set maximum write burst size on frontend connection per worker. Setting 0 to this option -means write burst size is unlimited. +means write burst size is unlimited. Not +implemented yet. Default: 0 .TP \fB\-\-worker\-frontend\-connections=\fR @@ -126,8 +128,19 @@ Default: 0 \fB\-\-backend\-http1\-connections\-per\-host=\fR Set maximum number of backend concurrent HTTP/1 connections per host. This option is meaningful -when \fB\-s\fR option is used. +when \fB\-s\fR option is used. To limit the number of +connections per frontend for default mode, use +\fB\-\-backend\-http1\-connections\-per\-frontend\fR. Default: 8 +.TP +\fB\-\-backend\-http1\-connections\-per\-frontend=\fR +Set maximum number of backend concurrent HTTP/1 +connections per frontend. This option is only +used for default mode. 0 means unlimited. To +limit the number of connections per host for +HTTP/2 or SPDY proxy mode (\fB\-s\fR option), use +\fB\-\-backend\-http1\-connections\-per\-host\fR. +Default: 0 .SS "Timeout:" .TP \fB\-\-frontend\-http2\-read\-timeout=\fR @@ -223,7 +236,7 @@ most desirable protocol comes first. This is used in both ALPN and NPN. The parameter must be delimited by a single comma only and any white spaces are treated as a part of protocol string. -Default: h2\-14,spdy/3.1,http/1.1 +Default: h2\-16,h2\-14,spdy/3.1,http/1.1 .TP \fB\-\-verify\-client\fR Require and verify client certificate. diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index e73c2f34..6c0551fc 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -60,7 +60,7 @@ Connections Set listen backlog size. If -1 is given, libevent will choose suitable value. - Default: -1 + Default: 128 .. option:: --backend-ipv4 @@ -111,11 +111,9 @@ Performance Set maximum read burst size on frontend - connection. Setting 0 does not work, but it is - not a problem because --read-rate=0 will give - unlimited read rate regardless of this option - value. - Default: 1073741824 + connection. Setting 0 to this option means read + burst size is unlimited. + Default: 0 .. option:: --write-rate= @@ -138,7 +136,8 @@ Performance Set maximum average read rate on frontend connection per worker. Setting 0 to this option - means read rate is unlimited. + means read rate is unlimited. Not implemented + yet. Default: 0 .. option:: --worker-read-burst= @@ -146,7 +145,8 @@ Performance Set maximum read burst size on frontend connection per worker. Setting 0 to this option - means read burst size is unlimited. + means read burst size is unlimited. Not + implemented yet. Default: 0 .. option:: --worker-write-rate= @@ -154,7 +154,8 @@ Performance Set maximum average write rate on frontend connection per worker. Setting 0 to this option - means write rate is unlimited. + means write rate is unlimited. Not implemented + yet. Default: 0 .. option:: --worker-write-burst= @@ -162,7 +163,8 @@ Performance Set maximum write burst size on frontend connection per worker. Setting 0 to this option - means write burst size is unlimited. + means write burst size is unlimited. Not + implemented yet. Default: 0 .. option:: --worker-frontend-connections= @@ -177,9 +179,22 @@ Performance Set maximum number of backend concurrent HTTP/1 connections per host. This option is meaningful - when :option:`-s` option is used. + when :option:`-s` option is used. To limit the number of + connections per frontend for default mode, use + :option:`--backend-http1-connections-per-frontend`. Default: 8 +.. option:: --backend-http1-connections-per-frontend= + + + Set maximum number of backend concurrent HTTP/1 + connections per frontend. This option is only + used for default mode. 0 means unlimited. To + limit the number of connections per host for + HTTP/2 or SPDY proxy mode (:option:`-s` option), use + :option:`--backend-http1-connections-per-host`. + Default: 0 + Timeout ^^^^^^^ @@ -312,7 +327,7 @@ SSL/TLS used in both ALPN and NPN. The parameter must be delimited by a single comma only and any white spaces are treated as a part of protocol string. - Default: h2-14,spdy/3.1,http/1.1 + Default: h2-16,h2-14,spdy/3.1,http/1.1 .. option:: --verify-client