From 199600af7349ca1048fceb746d815aeac0814285 Mon Sep 17 00:00:00 2001 From: Jianqing Wang Date: Tue, 29 Mar 2016 12:09:52 +0800 Subject: [PATCH 1/3] Fix error messages on deprecated mode --- src/shrpx_config.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc index 2290b06c..8fbc3155 100644 --- a/src/shrpx_config.cc +++ b/src/shrpx_config.cc @@ -1870,12 +1870,11 @@ int parse_config(const StringRef &opt, const StringRef &optarg, return 0; case SHRPX_OPTID_HTTP2_BRIDGE: - LOG(ERROR) << opt << ": deprecated. Use backend=,;;proto=h2 " - "and backend-tls"; + LOG(ERROR) << opt << ": deprecated. Use backend=,;;proto=h2;tls"; return -1; case SHRPX_OPTID_CLIENT_PROXY: - LOG(ERROR) << opt << ": deprecated. Use http2-proxy, frontend-no-tls, " - "backend=,;;proto=h2 and backend-tls"; + LOG(ERROR) << opt << ": deprecated. Use http2-proxy, frontend=,;no-tls " + "and backend=,;;proto=h2;tls"; return -1; case SHRPX_OPTID_ADD_X_FORWARDED_FOR: mod_config()->http.xff.add = util::strieq_l("yes", optarg); @@ -2120,7 +2119,7 @@ int parse_config(const StringRef &opt, const StringRef &optarg, return 0; case SHRPX_OPTID_CLIENT: - LOG(ERROR) << opt << ": deprecated. Use frontend-no-tls, " + LOG(ERROR) << opt << ": deprecated. Use frontend=,;no-tls, " "backend=,;;proto=h2 and backend-tls"; return -1; case SHRPX_OPTID_INSECURE: From cdb466956d1c196976506eaf3cc263dd79bc1328 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 29 Mar 2016 22:10:30 +0900 Subject: [PATCH 2/3] nghttpx: One more fix for usage help --- src/shrpx_config.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc index 8fbc3155..5de71fd0 100644 --- a/src/shrpx_config.cc +++ b/src/shrpx_config.cc @@ -2120,7 +2120,7 @@ int parse_config(const StringRef &opt, const StringRef &optarg, return 0; case SHRPX_OPTID_CLIENT: LOG(ERROR) << opt << ": deprecated. Use frontend=,;no-tls, " - "backend=,;;proto=h2 and backend-tls"; + "backend=,;;proto=h2;tls"; return -1; case SHRPX_OPTID_INSECURE: mod_config()->tls.insecure = util::strieq_l("yes", optarg); From e30edb096ac42be74b785f82c48f3bcca179f1cb Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 29 Mar 2016 22:11:42 +0900 Subject: [PATCH 3/3] clang-format --- src/shrpx_config.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc index 5de71fd0..1bb0266f 100644 --- a/src/shrpx_config.cc +++ b/src/shrpx_config.cc @@ -1870,11 +1870,14 @@ int parse_config(const StringRef &opt, const StringRef &optarg, return 0; case SHRPX_OPTID_HTTP2_BRIDGE: - LOG(ERROR) << opt << ": deprecated. Use backend=,;;proto=h2;tls"; + LOG(ERROR) << opt + << ": deprecated. Use backend=,;;proto=h2;tls"; return -1; case SHRPX_OPTID_CLIENT_PROXY: - LOG(ERROR) << opt << ": deprecated. Use http2-proxy, frontend=,;no-tls " - "and backend=,;;proto=h2;tls"; + LOG(ERROR) + << opt + << ": deprecated. Use http2-proxy, frontend=,;no-tls " + "and backend=,;;proto=h2;tls"; return -1; case SHRPX_OPTID_ADD_X_FORWARDED_FOR: mod_config()->http.xff.add = util::strieq_l("yes", optarg);