the "-k startssl" parameter is reverted by popular demand

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95269 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 36f15d3f2688dd9f4aab8bee238ae252f36e6b72..033cc9f6ea20ad7aee37498fe7a71bc6c8f6a3f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,10 +6,9 @@ Changes with Apache 2.0.37
   *) Fix a file permissions problem which prevented mod_disk_cache
      from working on Unix.  [Jeff Trawick]
 
-  *) Add "-k start|startssl|restart|graceful|stop" support to httpd
-     for the Unix MPMs.  These have semantics very similar to the
-     old apachectl commands of the same name.
-     [Justin Erenkrantz, Jeff Trawick]
+  *) Add "-k start|restart|graceful|stop" support to httpd for the Unix 
+     MPMs.  These have semantics very similar to the old apachectl 
+     commands of the same name.  [Justin Erenkrantz, Jeff Trawick]
 
   *) Make sure that the runtime dir is created by make install.
      PR 9233.  [Jeff Trawick]

diff --git a/server/main.c b/server/main.c
index 6dfbfc2eae8cec85996f01ddcef9e3f358be8f8e..2fc2e01e09945dd1d55a3f53b3f6a77a7b709339 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -312,7 +312,7 @@ static void usage(process_rec *process)
 #endif
 #ifdef AP_MPM_WANT_SIGNAL_SERVER
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                 "       %s [-k start|startssl|restart|graceful|stop]",
+                 "       %s [-k start|restart|graceful|stop]",
                  pad);
 #endif
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 36c02af4b9a21e0f30450ee4059b8006ab2dc085..bfe7c755d34f15700858e37a1f187893c2740df1 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -850,14 +850,6 @@ void ap_mpm_rewrite_args(process_rec *process)
                     dash_k_arg = optarg;
                     break;
                 }
-                if (!strcmp(optarg, "startssl")) {
-                    char **new_define;
-
-                    dash_k_arg = "start";
-                    new_define = (char **)apr_array_push(ap_server_config_defines);
-                    *new_define = "SSL";
-                    break;
-                }
             }
         default:
             *(const char **)apr_array_push(mpm_new_argv) =