From c5ad8779dc3166cb09aed1e73c8e0573ef7ba9f1 Mon Sep 17 00:00:00 2001 From: Aaron Bannert Date: Fri, 19 Oct 2001 23:45:39 +0000 Subject: [PATCH] Missed some error messages in the switch to the new lock system. Added the proc_mutex header for the sake of consistency. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91582 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/worker/worker.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 4e57dda740..a796fc3989 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -70,6 +70,7 @@ #include "apr_thread_proc.h" #include "apr_signal.h" #include "apr_thread_mutex.h" +#include "apr_proc_mutex.h" #define APR_WANT_STRFUNC #include "apr_want.h" @@ -588,7 +589,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy) if ((rv = SAFE_ACCEPT(apr_proc_mutex_lock(accept_mutex))) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, - "apr_lock_acquire failed. Attempting to shutdown " + "apr_proc_mutex_lock failed. Attempting to shutdown " "process gracefully."); signal_workers(); } @@ -655,8 +656,8 @@ static void *listener_thread(apr_thread_t *thd, void * dummy) if ((rv = SAFE_ACCEPT(apr_proc_mutex_unlock(accept_mutex))) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, - "apr_lock_release failed. Attempting to shutdown " - "process gracefully."); + "apr_proc_mutex_lock failed. Attempting to " + "shutdown process gracefully."); signal_workers(); } if (csd != NULL) { @@ -676,8 +677,8 @@ static void *listener_thread(apr_thread_t *thd, void * dummy) if ((rv = SAFE_ACCEPT(apr_proc_mutex_unlock(accept_mutex))) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, - "apr_lock_release failed. Attempting to shutdown " - "process gracefully."); + "apr_proc_mutex_unlock failed. Attempting to " + "shutdown process gracefully."); signal_workers(); } break; -- 2.40.0