Commit 4da373ce authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 8e27fec2

CHANGES

+3 −4
Changes for CHANGES: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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]


































server/main.c



+1
−1



























Changes for server/main.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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,


































server/mpm_common.c



+0
−8



























Changes for server/mpm_common.c: 0 added lines, 8 removed lines.



Original line number
Diff line number
Diff line







@@ -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) =