nghttpx: Rename --{front,back}end-spdy-no-tls as --{front,back}end-no-tls

src/shrpx.cc

@@ -537,17 +537,13 @@ void print_help(std::ostream& out)
       << "                       frontend connection to 2**<N>.\n"
       << "                       Default: "
       << get_config()->spdy_upstream_window_bits << "\n"
-      << "    --frontend-spdy-no-tls\n"
-      << "                       Disable SSL/TLS on frontend HTTP/2.0\n"
-      << "                       connections.This option also disables\n"
-      << "                       frontend SPDY and HTTP/1.1.\n"
+      << "    --frontend-no-tls  Disable SSL/TLS on frontend connections.\n"
       << "    --backend-spdy-window-bits=<N>\n"
       << "                       Sets the initial window size of HTTP/2.0 and SPDY\n"
       << "                       backend connection to 2**<N>.\n"
       << "                       Default: "
       << get_config()->spdy_downstream_window_bits << "\n"
-      << "    --backend-spdy-no-tls\n"
-      << "                       Disable SSL/TLS on backend HTTP/2.0 connections.\n"
+      << "    --backend-no-tls   Disable SSL/TLS on backend connections.\n"
       << "\n"
       << "  Mode:\n"
       << "    -s, --spdy-proxy   Enable secure HTTP/2.0 and SPDY proxy mode.\n"
@@ -646,8 +642,8 @@ int main(int argc, char **argv)
       {"subcert", required_argument, &flag, 24},
       {"spdy-bridge", no_argument, &flag, 25},
       {"backend-http-proxy-uri", required_argument, &flag, 26},
-      {"backend-spdy-no-tls", no_argument, &flag, 27},
-      {"frontend-spdy-no-tls", no_argument, &flag, 29},
+      {"backend-no-tls", no_argument, &flag, 27},
+      {"frontend-no-tls", no_argument, &flag, 29},
       {"backend-tls-sni-field", required_argument, &flag, 31},
       {"honor-cipher-order", no_argument, &flag, 32},
       {0, 0, 0, 0 }
@@ -810,13 +806,13 @@ int main(int argc, char **argv)
                                          optarg));
         break;
       case 27:
-        // --backend-spdy-no-tls
-        cmdcfgs.push_back(std::make_pair(SHRPX_OPT_BACKEND_SPDY_NO_TLS,
+        // --backend-no-tls
+        cmdcfgs.push_back(std::make_pair(SHRPX_OPT_BACKEND_NO_TLS,
                                          "yes"));
         break;
       case 29:
-        // --frontend-spdy-no-tls
-        cmdcfgs.push_back(std::make_pair(SHRPX_OPT_FRONTEND_SPDY_NO_TLS,
+        // --frontend-no-tls
+        cmdcfgs.push_back(std::make_pair(SHRPX_OPT_FRONTEND_NO_TLS,
                                          "yes"));
         break;
       case 31:

src/shrpx_config.cc

@@ -75,8 +75,8 @@ const char
 SHRPX_OPT_BACKEND_KEEP_ALIVE_TIMEOUT[] = "backend-keep-alive-timeout";
 const char SHRPX_OPT_FRONTEND_SPDY_WINDOW_BITS[] = "frontend-spdy-window-bits";
 const char SHRPX_OPT_BACKEND_SPDY_WINDOW_BITS[] = "backend-spdy-window-bits";
-const char SHRPX_OPT_FRONTEND_SPDY_NO_TLS[] = "frontend-spdy-no-tls";
-const char SHRPX_OPT_BACKEND_SPDY_NO_TLS[] = "backend-spdy-no-tls";
+const char SHRPX_OPT_FRONTEND_NO_TLS[] = "frontend-no-tls";
+const char SHRPX_OPT_BACKEND_NO_TLS[] = "backend-no-tls";
 const char SHRPX_OPT_BACKEND_TLS_SNI_FIELD[] = "backend-tls-sni-field";
 const char SHRPX_OPT_PID_FILE[] = "pid-file";
 const char SHRPX_OPT_USER[] = "user";
@@ -265,9 +265,9 @@ int parse_config(const char *opt, const char *optarg)
                  << " specify the integer in the range [0, 30], inclusive";
       return -1;
     }
-  } else if(util::strieq(opt, SHRPX_OPT_FRONTEND_SPDY_NO_TLS)) {
+  } else if(util::strieq(opt, SHRPX_OPT_FRONTEND_NO_TLS)) {
     mod_config()->spdy_upstream_no_tls = util::strieq(optarg, "yes");
-  } else if(util::strieq(opt, SHRPX_OPT_BACKEND_SPDY_NO_TLS)) {
+  } else if(util::strieq(opt, SHRPX_OPT_BACKEND_NO_TLS)) {
     mod_config()->spdy_downstream_no_tls = util::strieq(optarg, "yes");
   } else if(util::strieq(opt, SHRPX_OPT_BACKEND_TLS_SNI_FIELD)) {
     set_config_str(&mod_config()->backend_tls_sni_name, optarg);

src/shrpx_config.h

@@ -68,8 +68,8 @@ extern const char SHRPX_OPT_ACCESSLOG[];
 extern const char SHRPX_OPT_BACKEND_KEEP_ALIVE_TIMEOUT[];
 extern const char SHRPX_OPT_FRONTEND_SPDY_WINDOW_BITS[];
 extern const char SHRPX_OPT_BACKEND_SPDY_WINDOW_BITS[];
-extern const char SHRPX_OPT_FRONTEND_SPDY_NO_TLS[];
-extern const char SHRPX_OPT_BACKEND_SPDY_NO_TLS[];
+extern const char SHRPX_OPT_FRONTEND_NO_TLS[];
+extern const char SHRPX_OPT_BACKEND_NO_TLS[];
 extern const char SHRPX_OPT_PID_FILE[];
 extern const char SHRPX_OPT_USER[];
 extern const char SHRPX_OPT_SYSLOG[];