From fc658e628bc7a2f23790d5be97e5d8f6e25d755a Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 24 May 2002 18:48:10 +0000 Subject: [PATCH] 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 --- CHANGES | 7 +++---- server/main.c | 2 +- server/mpm_common.c | 8 -------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 36f15d3f26..033cc9f6ea 100644 --- 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 6dfbfc2eae..2fc2e01e09 100644 --- 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 36c02af4b9..bfe7c755d3 100644 --- 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) = -- 2.50.1