From: Jeff Trawick <trawick@apache.org>
Date: Mon, 13 Aug 2001 14:58:24 +0000 (+0000)
Subject: get threaded to compile again by fixing a lock_fname/ap_lock_fname mixup
X-Git-Tag: 2.0.24~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=989190cf1940f5fed63ae34f9a6bfed2b408df27;p=apache

get threaded to compile again by fixing a lock_fname/ap_lock_fname mixup


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

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index a35dfb636b..68280d5a12 100644
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -768,7 +768,7 @@ static void child_main(int child_num_arg)
     /*stuff to do before we switch id's, so we have permissions.*/
     reopen_scoreboard(pchild);
 
-    rv = SAFE_ACCEPT(apr_lock_child_init(&accept_mutex, lock_fname,
+    rv = SAFE_ACCEPT(apr_lock_child_init(&accept_mutex, ap_lock_fname,
                      pchild));
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
@@ -1218,11 +1218,11 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     ap_log_pid(pconf, ap_pid_fname);
 
     /* Initialize cross-process accept lock */
-    lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
-                             ap_server_root_relative(_pconf, lock_fname),
-                             ap_my_pid);
+    ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT,
+                                 ap_server_root_relative(_pconf, ap_lock_fname),
+                                 ap_my_pid);
     rv = apr_lock_create_np(&accept_mutex, APR_MUTEX, APR_LOCKALL,
-                            accept_lock_mech, lock_fname, _pconf);
+                            accept_lock_mech, ap_lock_fname, _pconf);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
                      "Couldn't create accept lock");
@@ -1367,7 +1367,7 @@ static void threaded_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t
     ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
     ap_pid_fname = DEFAULT_PIDLOG;
     ap_scoreboard_fname = DEFAULT_SCOREBOARD;
-    lock_fname = DEFAULT_LOCKFILE;
+    ap_lock_fname = DEFAULT_LOCKFILE;
     ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
     ap_extended_status = 0;