From 90b06e857234f97afd32a0de2acde93915a3ac4c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 26 Jul 2013 21:55:08 +0900 Subject: [PATCH] nghttpx: Add HTTP/2.0 word in help message --- src/shrpx.cc | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/shrpx.cc b/src/shrpx.cc index cae6bd46..53df0cb2 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -414,7 +414,7 @@ void print_usage(std::ostream& out) << " [-f ] [-n ] [-c ] [-L ]\n" << " [OPTIONS...] [ ]\n" << "\n" - << "A reverse proxy for SPDY/HTTPS.\n" + << "A reverse proxy for HTTP/2.0, SPDY/HTTPS.\n" << std::endl; } } // namespace @@ -457,16 +457,15 @@ void print_help(std::ostream& out) << "\n" << " Timeout:\n" << " --frontend-spdy-read-timeout=\n" - << " Specify read timeout for SPDY frontend\n" + << " Specify read timeout for HTTP/2.0 and SPDY frontend\n" << " connection. Default: " << get_config()->spdy_upstream_read_timeout.tv_sec << "\n" << " --frontend-read-timeout=\n" - << " Specify read timeout for non-SPDY frontend\n" + << " Specify read timeout for HTTP/1.1 frontend\n" << " connection. Default: " << get_config()->upstream_read_timeout.tv_sec << "\n" << " --frontend-write-timeout=\n" - << " Specify write timeout for both SPDY and\n" - << " non-SPDY frontends.\n" + << " Specify write timeout for all frontends.\n" << " connection. Default: " << get_config()->upstream_write_timeout.tv_sec << "\n" << " --backend-read-timeout=\n" @@ -487,7 +486,7 @@ void print_help(std::ostream& out) << " a proxy requires authentication, specify\n" << " and . Note that they must be\n" << " properly percent-encoded. This proxy is used\n" - << " when the backend connection is SPDY. First,\n" + << " when the backend connection is HTTP/2.0. First,\n" << " make a CONNECT request to the proxy and\n" << " it connects to the backend on behalf of\n" << " nghttpx. This forms tunnel. After that, nghttpx\n" @@ -528,40 +527,40 @@ void print_help(std::ostream& out) << " extension. This will default to the backend\n" << " HOST name.\n" << "\n" - << " SPDY:\n" + << " HTTP/2.0 and SPDY:\n" << " -c, --spdy-max-concurrent-streams=\n" << " Set the maximum number of the concurrent\n" - << " streams in one SPDY session.\n" + << " streams in one HTTP/2.0 and SPDY session.\n" << " Default: " << get_config()->spdy_max_concurrent_streams << "\n" << " --frontend-spdy-window-bits=\n" - << " Sets the initial window size of SPDY\n" + << " Sets the initial window size of HTTP/2.0 and SPDY\n" << " frontend connection to 2**.\n" << " Default: " << get_config()->spdy_upstream_window_bits << "\n" << " --frontend-spdy-no-tls\n" - << " Disable SSL/TLS on frontend SPDY\n" + << " Disable SSL/TLS on frontend HTTP/2.0\n" << " connections.This option also disables\n" - << " frontend HTTP/1.1.\n" + << " frontend SPDY and HTTP/1.1.\n" << " --backend-spdy-window-bits=\n" - << " Sets the initial window size of SPDY\n" + << " Sets the initial window size of HTTP/2.0 and SPDY\n" << " backend connection to 2**.\n" << " Default: " << get_config()->spdy_downstream_window_bits << "\n" << " --backend-spdy-no-tls\n" - << " Disable SSL/TLS on backend SPDY connections.\n" + << " Disable SSL/TLS on backend HTTP/2.0 connections.\n" << "\n" << " Mode:\n" - << " -s, --spdy-proxy Enable secure SPDY proxy mode.\n" - << " --spdy-bridge Communicate with the backend in SPDY. Thus\n" - << " the incoming SPDY/HTTPS connections are\n" - << " converted to SPDY connection and relayed to\n" + << " -s, --spdy-proxy Enable secure HTTP/2.0 and SPDY proxy mode.\n" + << " --spdy-bridge Communicate with the backend in HTTP/2.0. Thus\n" + << " the incoming all connections are\n" + << " converted to HTTP/2.0 connection and relayed to\n" << " the backend. See --backend-http-proxy-uri\n" << " option if you are behind the proxy and want\n" - << " to connect to the outside SPDY proxy.\n" - << " --client Instead of accepting SPDY/HTTPS connection,\n" - << " accept HTTP connection and communicate with\n" - << " backend server in SPDY. To use nghttpx as\n" + << " to connect to the outside HTTP/2.0 proxy.\n" + << " --client Instead of accepting HTTP/2.0, SPDY/HTTPS connection,\n" + << " accept plain HTTP/1.1 connection and communicate with\n" + << " backend server in HTTP/2.0. To use nghttpx as\n" << " a forward proxy, use -p option instead.\n" << " -p, --client-proxy Like --client option, but it also requires\n" << " the request path from frontend must be\n"