From 290a697bf9426d92334f838b33b278e8d6f13ede Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 29 Mar 2016 22:11:58 +0900
Subject: [PATCH] Merge branch 'tsing-patch-1'

---
 src/shrpx_config.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc
index 2290b06c..1bb0266f 100644
--- a/src/shrpx_config.cc
+++ b/src/shrpx_config.cc
@@ -1870,12 +1870,14 @@ int parse_config(const StringRef &opt, const StringRef &optarg,
 
     return 0;
   case SHRPX_OPTID_HTTP2_BRIDGE:
-    LOG(ERROR) << opt << ": deprecated.  Use backend=<addr>,<port>;;proto=h2 "
-                         "and backend-tls";
+    LOG(ERROR) << opt
+               << ": deprecated.  Use backend=<addr>,<port>;;proto=h2;tls";
     return -1;
   case SHRPX_OPTID_CLIENT_PROXY:
-    LOG(ERROR) << opt << ": deprecated.  Use http2-proxy, frontend-no-tls, "
-                         "backend=<addr>,<port>;;proto=h2 and backend-tls";
+    LOG(ERROR)
+        << opt
+        << ": deprecated.  Use http2-proxy, frontend=<addr>,<port>;no-tls "
+           "and backend=<addr>,<port>;;proto=h2;tls";
     return -1;
   case SHRPX_OPTID_ADD_X_FORWARDED_FOR:
     mod_config()->http.xff.add = util::strieq_l("yes", optarg);
@@ -2120,8 +2122,8 @@ int parse_config(const StringRef &opt, const StringRef &optarg,
 
     return 0;
   case SHRPX_OPTID_CLIENT:
-    LOG(ERROR) << opt << ": deprecated.  Use frontend-no-tls, "
-                         "backend=<addr>,<port>;;proto=h2 and backend-tls";
+    LOG(ERROR) << opt << ": deprecated.  Use frontend=<addr>,<port>;no-tls, "
+                         "backend=<addr>,<port>;;proto=h2;tls";
     return -1;
   case SHRPX_OPTID_INSECURE:
     mod_config()->tls.insecure = util::strieq_l("yes", optarg);