httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject Re: cvs commit: httpd-2.0/modules/ssl ssl_engine_config.c
Date Fri, 28 Mar 2003 00:25:24 GMT
Cool beans... Some comments:

>   -    else if (strcEQ(arg, "sysvsem")) {
>   -        mc->nMutexMode  = SSL_MUTEXMODE_USED;
>   +    else if (!strcasecmp(meth, "sysvsem") && file) {

We should not require that sysvsem lists a file..

>    #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) {
>   -            return apr_pstrcat(cmd->pool, "Invalid SSLMutex file: path ", 
>   -                               arg+5, NULL);
>   -        }
>   -        mc->nMutexMode  = SSL_MUTEXMODE_USED;
>    #if APR_HAS_FLOCK_SERIALIZE
>   +    else if (!strcasecmp(meth, "file") && file) {
>            mc->nMutexMech  = APR_LOCK_FLOCK;
>   -#endif
>   -#if APR_HAS_FCNTL_SERIALIZE
>   +    }
>   +#elif APR_HAS_FCNTL_SERIALIZE
>   +    else if (!strcasecmp(meth, "file") && file) {
>            mc->nMutexMech  = APR_LOCK_FCNTL;

This imples that, with file, flock is prefered over fcntl. These should be
reversed to match the ordering everywhere else :)

>   -        mc->nMutexMode  = SSL_MUTEXMODE_USED;
>    #if APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)
>   +    else if (!strcasecmp(meth, "sem")) {
>            mc->nMutexMech  = APR_LOCK_SYSVSEM;
>   -#endif
>   -#if APR_HAS_POSIXSEM_SERIALIZE
>   +    }
>   +#elif APR_HAS_POSIXSEM_SERIALIZE
>   +    else if (!strcasecmp(meth, "sem")) {
>            mc->nMutexMech  = APR_LOCK_POSIXSEM;

These should be reversed as well, so that posix is prefered over sysvsem

-- 
===========================================================================
   Jim Jagielski   [|]   jim@jaguNET.com   [|]   http://www.jaguNET.com/
      "A society that will trade a little liberty for a little order
             will lose both and deserve neither" - T.Jefferson

Mime
View raw message