www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Right now SSLMutex is bogus. It just uses APR_LOCK_DEFAULT no

Browse Source 
matter what. We now allow for the full range of APR mutex
locking mechanims to be used, while maintaining backwards
compatibility.

PR: 8122
Obtained from:
Submitted by:
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98771 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2003-02-23 17:12:43 +00:00
parent ee1225a25e
commit 694eb48bae
5 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
modules/ssl/ssl_engine_config.c
View File

@@ -99,6 +99,7 @@ SSLModConfigRec *ssl_config_global_create(server_rec *s)
mc->pSessionCacheDataRMM = NULL;
mc->tSessionCacheDataTable = NULL;
mc->nMutexMode = SSL_MUTEXMODE_UNSET;
mc->nMutexMech = APR_LOCK_DEFAULT;
mc->szMutexFile = NULL;
mc->pMutex = NULL;
mc->aRandSeed = apr_array_make(pool, 4,
@@ -383,6 +384,60 @@ const char *ssl_cmd_SSLMutex(cmd_parms *cmd,
if (strcEQ(arg, "none") || strcEQ(arg, "no")) {
mc->nMutexMode = SSL_MUTEXMODE_NONE;
}
/* NOTE: previously, 'yes' implied 'sem' */
else if (strcEQ(arg, "default") || strcEQ(arg, "yes")) {
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_DEFAULT;
mc->szMutexFile = NULL; /* APR determines temporary filename */
}
#if APR_HAS_FLOCK_SERIALIZE
else if (strlen(arg) > 6 && strcEQn(arg, "flock:", 6)) {
const char *file = ap_server_root_relative(cmd->pool, arg+6);
if (!file) {
return apr_pstrcat(cmd->pool, "Invalid SSLMutex flock: path ",
arg+6, NULL);
}
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_FLOCK;
mc->szMutexFile = apr_psprintf(mc->pPool, "%s.%lu",
file, (unsigned long)getpid());
}
#endif
#if APR_HAS_FCNTL_SERIALIZE
else if (strlen(arg) > 6 && strcEQn(arg, "fcntl:", 6)) {
const char *file = ap_server_root_relative(cmd->pool, arg+6);
if (!file) {
return apr_pstrcat(cmd->pool, "Invalid SSLMutex fcntl: path ",
arg+6, NULL);
}
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_FCNTL;
mc->szMutexFile = apr_psprintf(mc->pPool, "%s.%lu",
file, (unsigned long)getpid());
}
#endif
#if APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)
else if (strcEQ(arg, "sysvsem")) {
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_SYSVSEM;
mc->szMutexFile = NULL; /* APR determines temporary filename */
}
#endif
#if APR_HAS_POSIXSEM_SERIALIZE
else if (strcEQ(arg, "posixsem")) {
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_POSIXSEM;
mc->szMutexFile = NULL; /* APR determines temporary filename */
}
#endif
#if APR_HAS_PROC_PTHREAD_SERIALIZE
else if (strcEQ(arg, "pthread")) {
mc->nMutexMode = SSL_MUTEXMODE_USED;
mc->nMutexMech = APR_LOCK_PROC_PTHREAD;
mc->szMutexFile = NULL; /* APR determines temporary filename */
}
#endif
#if APR_HAS_FLOCK_SERIALIZE || APR_HAS_FCNTL_SERIALIZE
else if (strlen(arg) > 5 && strcEQn(arg, "file:", 5)) {
const char *file = ap_server_root_relative(cmd->pool, arg+5);
if (!file) {
@@ -390,17 +445,32 @@ const char *ssl_cmd_SSLMutex(cmd_parms *cmd,
arg+5, NULL);
}
mc->nMutexMode = SSL_MUTEXMODE_USED;
#if APR_HAS_FLOCK_SERIALIZE
mc->nMutexMech = APR_LOCK_FLOCK;
#endif
#if APR_HAS_FCNTL_SERIALIZE
mc->nMutexMech = APR_LOCK_FCNTL;
#endif
mc->szMutexFile =
apr_psprintf(mc->pPool, "%s.%lu",
file, (unsigned long)getpid());
}
else if (strcEQ(arg, "sem") || strcEQ(arg, "yes")) {
#endif
#if (APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)) || APR_HAS_POSIXSEM_SERIALIZE
else if (strcEQ(arg, "sem")) {
mc->nMutexMode = SSL_MUTEXMODE_USED;
#if APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)
mc->nMutexMech = APR_LOCK_SYSVSEM;
#endif
#if APR_HAS_POSIXSEM_SERIALIZE
mc->nMutexMech = APR_LOCK_POSIXSEM;
#endif
mc->szMutexFile = NULL; /* APR determines temporary filename */
}
#endif
else {
return apr_pstrcat(cmd->pool, "Invalid SSLMutex argument ",
arg, NULL);
arg, " (", ssl_valid_ssl_mutex_string, ")", NULL);
}
return NULL;