diff --git a/doc/h2load.1 b/doc/h2load.1 index 3eacb5dc..add4d6be 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,10 +1,10 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH H2LOAD "1" "October 2014" "h2load nghttp2/0.6.4" "User Commands" +.TH H2LOAD "1" "October 2014" "h2load nghttp2/0.6.5-DEV" "User Commands" .SH NAME h2load \- HTTP/2 benchmarking tool .SH SYNOPSIS .B h2load -[\fI\,OPTIONS\/\fR]... \fI\,\/\fR... +[\fI\,OPTIONS\/\fR]... [\fI\,URI\/\fR]... .SH DESCRIPTION benchmarking tool for HTTP/2 and SPDY server .TP @@ -26,6 +26,17 @@ Number of concurrent clients. Default: 1 \fB\-t\fR, \fB\-\-threads=\fR Number of native threads. Default: 1 .TP +\fB\-i\fR, \fB\-\-input\-file=\fR +Path of a file with multiple URIs are seperated +by EOLs. This option will disable URIs getting +from command\-line. If '\-' is given as , +URIs will be read from stdin. URIs are used in +this order for each client. All URIs are used, +then first URI is used and then 2nd URI, and so +on. The scheme, host and port in the subsequent +URIs, if present, are ignored. Those in the +first URI are used solely. +.TP \fB\-m\fR, \fB\-\-max\-concurrent\-streams=\fR(auto|) Max concurrent streams to issue per session. If "auto" is given, the number of given URIs is @@ -41,6 +52,9 @@ Sets the connection level initial window size to than 16, this option is ignored. Otherwise 2** is used for SPDY. .TP +\fB\-H\fR, \fB\-\-header=\fR
+Add/Override a header to the requests. +.TP \fB\-p\fR, \fB\-\-no\-tls\-proto=\fR Specify ALPN identifier of the protocol to be used when accessing http URI without SSL/TLS. diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst index dd20010f..9022005a 100644 --- a/doc/h2load.1.rst +++ b/doc/h2load.1.rst @@ -1,3 +1,5 @@ +.. DO NOT MODIFY THIS FILE! It was generated by man2rst.py + .. program:: h2load h2load(1) @@ -9,7 +11,7 @@ h2load - HTTP/2 benchmarking tool SYNOPSIS -------- -**h2load** [OPTIONS]... ... +**h2load** [OPTIONS]... [URI]... DESCRIPTION ----------- @@ -42,6 +44,19 @@ OPTIONS Number of native threads. Default: 1 +.. option:: -i, --input-file= + + + Path of a file with multiple URIs are seperated + by EOLs. This option will disable URIs getting + from command-line. If '-' is given as , + URIs will be read from stdin. URIs are used in + this order for each client. All URIs are used, + then first URI is used and then 2nd URI, and so + on. The scheme, host and port in the subsequent + URIs, if present, are ignored. Those in the + first URI are used solely. + .. option:: -m, --max-concurrent-streams=(auto|) @@ -63,6 +78,11 @@ OPTIONS than 16, this option is ignored. Otherwise 2\*\* is used for SPDY. +.. option:: -H, --header=
+ + + Add/Override a header to the requests. + .. option:: -p, --no-tls-proto= diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 1766eb87..6362250d 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" "October 2014" "nghttp nghttp2/0.6.4" "User Commands" +.TH NGHTTP "1" "October 2014" "nghttp nghttp2/0.6.5-DEV" "User Commands" .SH NAME nghttp \- HTTP/2 experimental client .SH SYNOPSIS @@ -40,13 +40,18 @@ Sets the connection level initial window size to Download assets such as stylesheets, images and script files linked from the downloaded resource. Only links whose origins are the same with the -linking resource will be downloaded. +linking resource will be downloaded. nghttp +prioritizes resources using HTTP/2 dependency +based priority. The priority order, from highest +to lowest, is html itself, css, javascript and +images. .TP \fB\-s\fR, \fB\-\-stat\fR Print statistics. .TP -\fB\-H\fR, \fB\-\-header\fR -Add a header to the requests. +\fB\-H\fR, \fB\-\-header=\fR
+Add a header to the requests. Example: +\fB\-H\fR':method: PUT' .TP \fB\-\-cert=\fR Use the specified client certificate file. The diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index a0bfd2d3..0d78654e 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -1,3 +1,5 @@ +.. DO NOT MODIFY THIS FILE! It was generated by man2rst.py + .. program:: nghttp nghttp(1) @@ -38,7 +40,7 @@ OPTIONS Save download data in the current directory. The filename is dereived from URI. If URI ends with - \&'/', 'index.html' is used as a filename. Not + '/', 'index.html' is used as a filename. Not implemented yet. .. option:: -t, --timeout= @@ -64,17 +66,22 @@ OPTIONS Download assets such as stylesheets, images and script files linked from the downloaded resource. Only links whose origins are the same with the - linking resource will be downloaded. + linking resource will be downloaded. nghttp + prioritizes resources using HTTP/2 dependency + based priority. The priority order, from highest + to lowest, is html itself, css, javascript and + images. .. option:: -s, --stat Print statistics. -.. option:: -H, --header +.. option:: -H, --header=
- Add a header to the requests. + Add a header to the requests. Example: + -H':method: PUT' .. option:: --cert= diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index 61b460b5..7820b8b9 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" "October 2014" "nghttpd nghttp2/0.6.4" "User Commands" +.TH NGHTTPD "1" "October 2014" "nghttpd nghttp2/0.6.5-DEV" "User Commands" .SH NAME nghttpd \- HTTP/2 experimental server .SH SYNOPSIS diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst index fa510281..0e8cb96c 100644 --- a/doc/nghttpd.1.rst +++ b/doc/nghttpd.1.rst @@ -1,3 +1,5 @@ +.. DO NOT MODIFY THIS FILE! It was generated by man2rst.py + .. program:: nghttpd nghttpd(1) diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index 8d155e1a..466c515a 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" "October 2014" "nghttpx nghttp2/0.6.4" "User Commands" +.TH NGHTTPX "1" "October 2014" "nghttpx nghttp2/0.6.5-DEV" "User Commands" .SH NAME nghttpx \- HTTP/2 experimental proxy .SH SYNOPSIS @@ -242,8 +242,8 @@ used in backend client authentication. \fB\-\-tls\-proto\-list=\fR Comma delimited list of SSL/TLS protocol to be enabled. The following protocols are available: -TLSv1.2, TLSv1.1, TLSv1.0 and SSLv3. The name -matching is done in case\-insensitive manner. The +TLSv1.2, TLSv1.1 and TLSv1.0. The name matching +is done in case\-insensitive manner. The parameter must be delimited by a single comma only and any white spaces are treated as a part of protocol string. @@ -357,6 +357,10 @@ Default: daemon Append X\-Forwarded\-For header field to the downstream request. .TP +\fB\-\-strip\-incoming\-x\-forwarded\-for\fR +Strip X\-Forwarded\-For header field from inbound +client requests. +.TP \fB\-\-no\-via\fR Don't append to Via header field. If Via header field is received, it is left unaltered. diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index 2cf9de7c..c876c0ea 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -1,3 +1,5 @@ +.. DO NOT MODIFY THIS FILE! It was generated by man2rst.py + .. program:: nghttpx nghttpx(1) @@ -339,8 +341,8 @@ SSL/TLS Comma delimited list of SSL/TLS protocol to be enabled. The following protocols are available: - TLSv1.2, TLSv1.1, TLSv1.0 and SSLv3. The name - matching is done in case-insensitive manner. The + TLSv1.2, TLSv1.1 and TLSv1.0. The name matching + is done in case-insensitive manner. The parameter must be delimited by a single comma only and any white spaces are treated as a part of protocol string. @@ -503,6 +505,12 @@ Misc Append X-Forwarded-For header field to the downstream request. +.. option:: --strip-incoming-x-forwarded-for + + + Strip X-Forwarded-For header field from inbound + client requests. + .. option:: --no-via