walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'tsing-patch-1'

This commit is contained in:
Tatsuhiro Tsujikawa 2016-03-29 22:11:58 +09:00
parent fe0843be88 e30edb096a
commit 1fef49aaa4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shrpx_config.cc
View File

@ -1870,12 +1870,14 @@ int parse_config(const StringRef &opt, const StringRef &optarg,
return 0; return 0;
case SHRPX_OPTID_HTTP2_BRIDGE: case SHRPX_OPTID_HTTP2_BRIDGE:
LOG(ERROR) << opt << ": deprecated. Use backend=<addr>,<port>;;proto=h2 " LOG(ERROR) << opt
"and backend-tls"; << ": deprecated. Use backend=<addr>,<port>;;proto=h2;tls";
return -1; return -1;
case SHRPX_OPTID_CLIENT_PROXY: case SHRPX_OPTID_CLIENT_PROXY:
LOG(ERROR) << opt << ": deprecated. Use http2-proxy, frontend-no-tls, " LOG(ERROR)
"backend=<addr>,<port>;;proto=h2 and backend-tls"; << opt
<< ": deprecated. Use http2-proxy, frontend=<addr>,<port>;no-tls "
"and backend=<addr>,<port>;;proto=h2;tls";
return -1; return -1;
case SHRPX_OPTID_ADD_X_FORWARDED_FOR: case SHRPX_OPTID_ADD_X_FORWARDED_FOR:
mod_config()->http.xff.add = util::strieq_l("yes", optarg); 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; return 0;
case SHRPX_OPTID_CLIENT: case SHRPX_OPTID_CLIENT:
LOG(ERROR) << opt << ": deprecated. Use frontend-no-tls, " LOG(ERROR) << opt << ": deprecated. Use frontend=<addr>,<port>;no-tls, "
"backend=<addr>,<port>;;proto=h2 and backend-tls"; "backend=<addr>,<port>;;proto=h2;tls";
return -1; return -1;
case SHRPX_OPTID_INSECURE: case SHRPX_OPTID_INSECURE:
mod_config()->tls.insecure = util::strieq_l("yes", optarg); mod_config()->tls.insecure = util::strieq_l("yes", optarg);