Commit 0e5351f0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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/modules/ssl@99146 13f79535-47bb-0310-9956-ffa450edef68
parent e0b4f527

ssl_engine_mutex.c

+15 −6
Original line number Diff line number Diff line
@@ -88,10 +88,18 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p) 
                         "Cannot create SSLMutex");

        return FALSE;

    }

#if APR_HAS_FLOCK_SERIALIZE

    if (mc->szMutexFile && mc->ChownMutexFile == TRUE)

        chown(mc->szMutexFile, unixd_config.user_id, -1);

#endif



#if APR_HAS_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);

        if (rv != APR_SUCCESS) {

            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");

            return FALSE;

        }

    }

#endif

    return TRUE;

}