From e03f36eeeb4a5ddcecf7e18efcf30b2206ee68de Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 29 Jan 2015 23:23:30 +0900 Subject: [PATCH] nghttpx: Use instead of --- src/shrpx.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/shrpx.cc b/src/shrpx.cc index 4af8d483..2a418a61 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -917,42 +917,42 @@ Performance: << R"( Timeout: - --frontend-http2-read-timeout= + --frontend-http2-read-timeout= Specify read timeout for HTTP/2 and SPDY frontend connection. Default: )" << util::duration_str(get_config()->http2_upstream_read_timeout) << R"( - --frontend-read-timeout= + --frontend-read-timeout= Specify read timeout for HTTP/1.1 frontend connection. Default: )" << util::duration_str(get_config()->upstream_read_timeout) << R"( - --frontend-write-timeout= + --frontend-write-timeout= Specify write timeout for all frontend connections. Default: )" << util::duration_str(get_config()->upstream_write_timeout) << R"( - --stream-read-timeout= + --stream-read-timeout= Specify read timeout for HTTP/2 and SPDY streams. 0 means no timeout. Default: )" << util::duration_str(get_config()->stream_read_timeout) << R"( - --stream-write-timeout= + --stream-write-timeout= Specify write timeout for HTTP/2 and SPDY streams. 0 means no timeout. Default: )" << util::duration_str(get_config()->stream_write_timeout) << R"( - --backend-read-timeout= + --backend-read-timeout= Specify read timeout for backend connection. Default: )" << util::duration_str(get_config()->downstream_read_timeout) << R"( - --backend-write-timeout= + --backend-write-timeout= Specify write timeout for backend connection. Default: )" << util::duration_str(get_config()->downstream_write_timeout) << R"( - --backend-keep-alive-timeout= + --backend-keep-alive-timeout= Specify keep-alive timeout for backend connection. Default: )" << util::duration_str(get_config()->downstream_idle_read_timeout) << R"( - --listener-disable-timeout= + --listener-disable-timeout= After accepting connection failed, connection listener is disabled for a given amount of time. Specifying 0 disables this feature. @@ -1221,9 +1221,9 @@ Misc: 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.)" << std::endl; + 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.)" << std::endl; } } // namespace