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 d915380d541374d6f6c2cf78257ebba80c1d27bb..538fcece0ddae98663ce7bd5042a28d89bb5cfdf 100644 (file)
--- 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 d1c5c8ed359977947c06b93c8a455a0df39f6f04..4ba1c256268e9db0ae2f2a84be914a8e85633650 100644 (file)
--- 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);
     }