diff --git a/doc/h2load.1 b/doc/h2load.1 index 34f02777..4f1f54c6 100644 --- a/doc/h2load.1 +++ b/doc/h2load.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "H2LOAD" "1" "March 27, 2015" "0.7.9" "nghttp2" +.TH "H2LOAD" "1" "March 31, 2015" "0.7.10-DEV" "nghttp2" .SH NAME h2load \- HTTP/2 benchmarking tool . diff --git a/doc/nghttp.1 b/doc/nghttp.1 index 7ffc9d8c..d5a48c8c 100644 --- a/doc/nghttp.1 +++ b/doc/nghttp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTP" "1" "March 27, 2015" "0.7.9" "nghttp2" +.TH "NGHTTP" "1" "March 31, 2015" "0.7.10-DEV" "nghttp2" .SH NAME nghttp \- HTTP/2 experimental client . diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst index bb5bd339..7000c7ac 100644 --- a/doc/nghttp.1.rst +++ b/doc/nghttp.1.rst @@ -162,6 +162,7 @@ OPTIONS Display this help and exit. + The argument is an integer and an optional unit (e.g., 10K is 10 * 1024). Units are K, M and G (powers of 1024). diff --git a/doc/nghttpd.1 b/doc/nghttpd.1 index a1fd977a..35647819 100644 --- a/doc/nghttpd.1 +++ b/doc/nghttpd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPD" "1" "March 27, 2015" "0.7.9" "nghttp2" +.TH "NGHTTPD" "1" "March 31, 2015" "0.7.10-DEV" "nghttp2" .SH NAME nghttpd \- HTTP/2 experimental server . diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst index 41c1bdff..537963d1 100644 --- a/doc/nghttpd.1.rst +++ b/doc/nghttpd.1.rst @@ -126,6 +126,7 @@ OPTIONS Display this help and exit. + The argument is an integer and an optional unit (e.g., 10K is 10 * 1024). Units are K, M and G (powers of 1024). diff --git a/doc/nghttpx.1 b/doc/nghttpx.1 index acbfe2fd..2832b267 100644 --- a/doc/nghttpx.1 +++ b/doc/nghttpx.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "NGHTTPX" "1" "March 27, 2015" "0.7.9" "nghttp2" +.TH "NGHTTPX" "1" "March 31, 2015" "0.7.10-DEV" "nghttp2" .SH NAME nghttpx \- HTTP/2 experimental proxy . @@ -46,7 +46,8 @@ Set path to server\(aqs private key. Required unless \fI\%\-p\fP, .TP .B Set path to server\(aqs certificate. Required unless \fI\%\-p\fP, -\fI\%\-\-client\fP or \fI\%\-\-frontend\-no\-tls\fP are given. +\fI\%\-\-client\fP or \fI\%\-\-frontend\-no\-tls\fP are given. To make OCSP +stapling work, this must be absolute path. .UNINDENT .SH OPTIONS .sp @@ -249,14 +250,14 @@ Default: \fB16K\fP Specify read timeout for HTTP/2 and SPDY frontend connection. .sp -Default: \fB180s\fP +Default: \fB3m\fP .UNINDENT .INDENT 0.0 .TP .B \-\-frontend\-read\-timeout= Specify read timeout for HTTP/1.1 frontend connection. .sp -Default: \fB180s\fP +Default: \fB3m\fP .UNINDENT .INDENT 0.0 .TP @@ -286,7 +287,7 @@ Default: \fB0\fP .B \-\-backend\-read\-timeout= Specify read timeout for backend connection. .sp -Default: \fB180s\fP +Default: \fB3m\fP .UNINDENT .INDENT 0.0 .TP @@ -348,7 +349,8 @@ password protected it\(aqll be requested interactively. Specify additional certificate and private key file. nghttpx will choose certificates based on the hostname indicated by client using TLS SNI extension. This -option can be used multiple times. +option can be used multiple times. To make OCSP +stapling work, must be absolute path. .UNINDENT .INDENT 0.0 .TP @@ -442,6 +444,26 @@ objects, which means session ID generated by one worker is not acceptable by another worker. On the other hand, session ticket key is shared across all worker threads. .UNINDENT +.INDENT 0.0 +.TP +.B \-\-fetch\-ocsp\-response\-file= +Path to fetch\-ocsp\-response script file. It should be +absolute path. +.sp +Default: \fB/usr/local/share/nghttp2/fetch\-ocsp\-response\fP +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-ocsp\-update\-interval= +Set interval to update OCSP response cache. +.sp +Default: \fB4h\fP +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-no\-ocsp +Disable OCSP stapling. +.UNINDENT .SS HTTP/2 and SPDY .INDENT 0.0 .TP @@ -759,8 +781,9 @@ 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 s or ms. If -a unit is omitted, a second is used as unit. +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 FILES .INDENT 0.0 .TP diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst index d3f5feb4..340a7408 100644 --- a/doc/nghttpx.1.rst +++ b/doc/nghttpx.1.rst @@ -21,7 +21,8 @@ A reverse proxy for HTTP/2, HTTP/1 and SPDY. .. describe:: Set path to server's certificate. Required unless :option:`-p`\, - :option:`--client` or :option:`\--frontend-no-tls` are given. + :option:`--client` or :option:`\--frontend-no-tls` are given. To make OCSP + stapling work, this must be absolute path. OPTIONS @@ -212,13 +213,13 @@ Timeout Specify read timeout for HTTP/2 and SPDY frontend connection. - Default: ``180s`` + Default: ``3m`` .. option:: --frontend-read-timeout= Specify read timeout for HTTP/1.1 frontend connection. - Default: ``180s`` + Default: ``3m`` .. option:: --frontend-write-timeout= @@ -244,7 +245,7 @@ Timeout Specify read timeout for backend connection. - Default: ``180s`` + Default: ``3m`` .. option:: --backend-write-timeout= @@ -301,7 +302,8 @@ SSL/TLS Specify additional certificate and private key file. nghttpx will choose certificates based on the hostname indicated by client using TLS SNI extension. This - option can be used multiple times. + option can be used multiple times. To make OCSP + stapling work, must be absolute path. .. option:: --backend-tls-sni-field= @@ -385,6 +387,23 @@ SSL/TLS is not acceptable by another worker. On the other hand, session ticket key is shared across all worker threads. +.. option:: --fetch-ocsp-response-file= + + Path to fetch-ocsp-response script file. It should be + absolute path. + + Default: ``/usr/local/share/nghttp2/fetch-ocsp-response`` + +.. option:: --ocsp-update-interval= + + Set interval to update OCSP response cache. + + Default: ``4h`` + +.. option:: --no-ocsp + + Disable OCSP stapling. + HTTP/2 and SPDY ~~~~~~~~~~~~~~~ @@ -670,12 +689,14 @@ Misc Print this help and exit. + 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 s or ms. If -a unit is omitted, a second is used as unit. +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. FILES -----