summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2002-10-11 17:41:52 +0200
committerRyan Bloom <rbb@apache.org>2002-10-11 17:41:52 +0200
commit2795dc66cac2ca24c2ae08e8346893ae817cd6eb (patch)
tree2dc63d56cdac9f53885863c3ec09db01cafb2bcd /server
parentFix a compile of compiler warnings. I don't know how these slipped past. (diff)
downloadapache2-2795dc66cac2ca24c2ae08e8346893ae817cd6eb.tar.xz
apache2-2795dc66cac2ca24c2ae08e8346893ae817cd6eb.zip
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
Diffstat (limited to 'server')
-rw-r--r--server/mpm/experimental/perchild/perchild.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 2179b4dde7..d9f26230ce 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),