From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Fri, 21 Sep 2001 14:29:33 +0000 (+0000)
Subject: Switch proc_pthread to pthread for the AcceptMutex directive.
X-Git-Tag: 2.0.26~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45ed1d06a2f7e958224d6298db4133ea3ed48862;p=thirdparty%2Fapache%2Fhttpd.git

Switch proc_pthread to pthread for the AcceptMutex directive.


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

diff --git a/CHANGES b/CHANGES
index d915380d541..538fcece0dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.26-dev
 
+  *) Switch proc_pthread AcceptMutex configuration directive to pthread to 
+     be consistent with 1.3.  [Justin Erenkrantz]
+
   *) Cache apr_explode_localtime() value for 15 seconds.
      [Brian Pane <bpane@pacbell.net>]
 
diff --git a/server/mpm_common.c b/server/mpm_common.c
index d1c5c8ed359..4ba1c256268 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -604,7 +604,7 @@ AP_DECLARE(const char *) ap_mpm_set_accept_lock_mech(cmd_parms *cmd,
     }
 #endif
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
-    else if (!strcasecmp(arg, "proc_pthread")) {
+    else if (!strcasecmp(arg, "pthread")) {
         ap_accept_lock_mech = APR_LOCK_PROC_PTHREAD;
     }
 #endif
@@ -621,7 +621,7 @@ AP_DECLARE(const char *) ap_mpm_set_accept_lock_mech(cmd_parms *cmd,
                            ", sysvsem"
 #endif
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
-                           ", proc_pthread"
+                           ", pthread"
 #endif
                            , NULL);
     }