From e13c9102b81c6e6a356fdf2560b07eaff8679c46 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 6 Dec 2014 23:03:50 +0900 Subject: [PATCH] Update man pages --- doc/h2load.1 | 2 +- doc/nghttp.1 | 2 +- doc/nghttpd.1 | 2 +- doc/nghttpx.1 | 25 ++++++++++++++----------- doc/nghttpx.1.rst | 23 +++++++++++++---------- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/doc/h2load.1 b/doc/h2load.1 index db895d56..6eebe239 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" "November 2014" "h2load nghttp2/0.6.7" "User Commands" +.TH H2LOAD "1" "December 2014" "h2load nghttp2/0.6.8-DEV" "User Commands" .SH NAME h2load \- HTTP/2 benchmarking tool .SH SYNOPSIS diff --git a/doc/nghttp.1 b/doc/nghttp.1 index eb91e58a..f96eaade 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" "November 2014" "nghttp nghttp2/0.6.7" "User Commands" +.TH NGHTTP "1" "December 2014" "nghttp nghttp2/0.6.8-DEV" "User Commands" .SH NAME nghttp \- HTTP/2 experimental client .SH SYNOPSIS diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index 95dd9622..dd1df922 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" "November 2014" "nghttpd nghttp2/0.6.7" "User Commands" +.TH NGHTTPD "1" "December 2014" "nghttpd nghttp2/0.6.8-DEV" "User Commands" .SH NAME nghttpd \- HTTP/2 experimental server .SH SYNOPSIS diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 66a50f13..ac21ddc0 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" "November 2014" "nghttpx nghttp2/0.6.7" "User Commands" +.TH NGHTTPX "1" "December 2014" "nghttpx nghttp2/0.6.8-DEV" "User Commands" .SH NAME nghttpx \- HTTP/2 experimental proxy .SH SYNOPSIS @@ -23,7 +23,11 @@ The options are categorized into several groups. .SS "Connections:" .TP \fB\-b\fR, \fB\-\-backend=\fR -Set backend host and port. +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. Default: '127.0.0.1,80' .TP \fB\-f\fR, \fB\-\-frontend=\fR @@ -119,12 +123,11 @@ Set maximum number of simultaneous connections frontend accepts. Setting 0 means unlimited. Default: 0 .TP -\fB\-\-backend\-connections\-per\-frontend=\fR -Set maximum number of backend simultaneous -connections per frontend. This option is -meaningful when the combination of HTTP/2 or SPDY -frontend and HTTP/1 backend is used. -Default: 100 +\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. +Default: 8 .SS "Timeout:" .TP \fB\-\-frontend\-http2\-read\-timeout=\fR @@ -135,7 +138,7 @@ Default: 180 \fB\-\-frontend\-read\-timeout=\fR Specify read timeout for HTTP/1.1 frontend connection. -Default: 30 +Default: 180 .TP \fB\-\-frontend\-write\-timeout=\fR Specify write timeout for all frontend @@ -154,7 +157,7 @@ Default: 0 .TP \fB\-\-backend\-read\-timeout=\fR Specify read timeout for backend connection. -Default: 30 +Default: 180 .TP \fB\-\-backend\-write\-timeout=\fR Specify write timeout for backend connection. @@ -163,7 +166,7 @@ Default: 30 \fB\-\-backend\-keep\-alive\-timeout=\fR Specify keep\-alive timeout for backend connection. -Default: 60 +Default: 600 .TP \fB\-\-listener\-disable\-timeout=\fR After accepting connection failed, connection diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index ee227ed2..e73c2f34 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -40,7 +40,11 @@ Connections .. option:: -b, --backend= - Set backend host and port. + 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. Default: '127.0.0.1,80' .. option:: -f, --frontend= @@ -168,14 +172,13 @@ Performance frontend accepts. Setting 0 means unlimited. Default: 0 -.. option:: --backend-connections-per-frontend= +.. option:: --backend-http1-connections-per-host= - Set maximum number of backend simultaneous - connections per frontend. This option is - meaningful when the combination of HTTP/2 or SPDY - frontend and HTTP/1 backend is used. - Default: 100 + Set maximum number of backend concurrent HTTP/1 + connections per host. This option is meaningful + when :option:`-s` option is used. + Default: 8 Timeout ^^^^^^^ @@ -192,7 +195,7 @@ Timeout Specify read timeout for HTTP/1.1 frontend connection. - Default: 30 + Default: 180 .. option:: --frontend-write-timeout= @@ -219,7 +222,7 @@ Timeout Specify read timeout for backend connection. - Default: 30 + Default: 180 .. option:: --backend-write-timeout= @@ -232,7 +235,7 @@ Timeout Specify keep-alive timeout for backend connection. - Default: 60 + Default: 600 .. option:: --listener-disable-timeout=