From: Ryan Bloom <rbb@apache.org>
Date: Fri, 11 Oct 2002 15:41:52 +0000 (+0000)
Subject: If the server is configured with an accept mutex type that isn't comaptible
X-Git-Tag: 2.0.44~311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2795dc66cac2ca24c2ae08e8346893ae817cd6eb;p=thirdparty%2Fapache%2Fhttpd.git

If the server is configured with an accept mutex type that isn't comaptible
with perchild, then force it to be FCNTL.

PR:	13311


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

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 2179b4dde7a..d9f26230ce1 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1328,6 +1328,14 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 
     ap_server_conf = s;
 
+    if ((ap_accept_lock_mech == APR_LOCK_SYSVSEM) || 
+        (ap_accept_lock_mech == APR_LOCK_POSIXSEM)) {
+        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
+                     "Server configured for an accept lock mechanism that "
+                     "cannot be used with perchild.  Falling back to FCNTL.");
+        ap_accept_lock_mech = APR_LOCK_FCNTL;
+    }
+
     /* Initialize cross-process accept lock */
     ap_lock_fname = apr_psprintf(_pconf, "%s.%u",
                                  ap_server_root_relative(_pconf, ap_lock_fname),