$OpenBSD: patch-server_mpm_common_c,v 1.3 2007/09/19 05:47:36 steven Exp $ --- server/mpm_common.c.orig Tue Jul 17 16:48:25 2007 +++ server/mpm_common.c Tue Sep 18 17:00:40 2007 @@ -980,19 +980,19 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco *exit_status = 1; return 1; } - status = "httpd (no pid file) not running"; + status = "httpd2 (no pid file) not running"; } else { have_pid_file = 1; if (kill(otherpid, 0) == 0) { running = 1; status = apr_psprintf(pconf, - "httpd (pid %" APR_PID_T_FMT ") already " + "httpd2 (pid %" APR_PID_T_FMT ") already " "running", otherpid); } else { status = apr_psprintf(pconf, - "httpd (pid %" APR_PID_T_FMT "?) not running", + "httpd2 (pid %" APR_PID_T_FMT "?) not running", otherpid); } } @@ -1016,7 +1016,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco if (!strcmp(dash_k_arg, "restart")) { if (!running) { - printf("httpd not running, trying to start\n"); + printf("httpd2 not running, trying to start\n"); } else { *exit_status = send_signal(otherpid, SIGHUP); @@ -1026,7 +1026,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco if (!strcmp(dash_k_arg, "graceful")) { if (!running) { - printf("httpd not running, trying to start\n"); + printf("httpd2 not running, trying to start\n"); } else { *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); @@ -1043,7 +1043,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); } #else - printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); + printf("httpd2 MPM \"" MPM_NAME "\" does not support graceful-stop\n"); #endif return 1; }