mirror of
https://github.com/apache/httpd.git
synced 2025-08-05 16:55:50 +03:00
Must fix - Win32 can't deal with this code, and we can no longer fix
sysv mutexes with an APR_USE_ test... we have to look at the choice! Reviewed by: Brian Pane, Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99146 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -88,10 +88,18 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
|
|||||||
"Cannot create SSLMutex");
|
"Cannot create SSLMutex");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
#if APR_HAS_FLOCK_SERIALIZE
|
||||||
if (mc->szMutexFile && mc->ChownMutexFile == TRUE)
|
if (mc->szMutexFile && mc->ChownMutexFile == TRUE)
|
||||||
chown(mc->szMutexFile, unixd_config.user_id, -1);
|
chown(mc->szMutexFile, unixd_config.user_id, -1);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if APR_HAS_SYSVSEM_SERIALIZE
|
||||||
#if APR_USE_SYSVSEM_SERIALIZE
|
#if APR_USE_SYSVSEM_SERIALIZE
|
||||||
|
if (mc->nMutexMech == APR_LOCK_DEFAULT ||
|
||||||
|
mc->nMutexMech == APR_LOCK_SYSVSEM) {
|
||||||
|
#else
|
||||||
|
if (mc->nMutexMech == APR_LOCK_SYSVSEM) {
|
||||||
|
#endif
|
||||||
rv = unixd_set_global_mutex_perms(mc->pMutex);
|
rv = unixd_set_global_mutex_perms(mc->pMutex);
|
||||||
if (rv != APR_SUCCESS) {
|
if (rv != APR_SUCCESS) {
|
||||||
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
|
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
|
||||||
@@ -99,6 +107,7 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
|
|||||||
"and Group directives");
|
"and Group directives");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user