From: Brian Pane <brianp@apache.org>
Date: Sat, 16 Feb 2002 22:04:23 +0000 (+0000)
Subject: Restored the permission setting for the accept mutex (which
X-Git-Tag: 2.0.33~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49d0218f1ba4a5ffcbf19c87962c2b6b59b0b9a5;p=apache

Restored the permission setting for the accept mutex (which
was lost in my previous commit to change to the new lock API)


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index e9eb4873f6..d456ec31fb 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -958,6 +958,20 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
         return 1;
     }
 
+#if APR_USE_SYSVSEM_SERIALIZE
+    if (ap_accept_lock_mech == APR_LOCK_DEFAULT || 
+        ap_accept_lock_mech == APR_LOCK_SYSVSEM) {
+#else
+    if (ap_accept_lock_mech == APR_LOCK_SYSVSEM) {
+#endif
+        rv = unixd_set_proc_mutex_perms(accept_mutex);
+        if (rv != APR_SUCCESS) {
+            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
+                         "Couldn't set permissions on cross-process lock");
+            return 1;
+        }
+    }
+
     if (!is_graceful) {
         if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
             return 1;