Commit 7b459f2a authored by Joe Orton's avatar Joe Orton
Browse files

* os/unix/os.h: Define AP_NEED_SET_MUTEX_PERMS. 

* modules/mappers/mod_rewrite.c, modules/ssl/ssl_engine_mutex.c: Use
AP_NEED_SET_MUTEX_PERMS to determine whether unixd_set_*_mutex_perms
calls are necessary.


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

modules/mappers/mod_rewrite.c

+3 −4
Original line number Diff line number Diff line
@@ -93,9 +93,8 @@ 


#include "mod_rewrite.h"



#if !defined(OS2) && !defined(WIN32) && !defined(BEOS)  && !defined(NETWARE)

#ifdef AP_NEED_SET_MUTEX_PERMS

#include "unixd.h"

#define MOD_REWRITE_SET_MUTEX_PERMS /* XXX Apache should define something */

#endif



/*
@@ -2432,7 +2431,7 @@ static apr_status_t rewritelock_create(server_rec *s, apr_pool_t *p) 
        return rc;

    }



#ifdef MOD_REWRITE_SET_MUTEX_PERMS

#ifdef AP_NEED_SET_MUTEX_PERMS

    rc = unixd_set_global_mutex_perms(rewrite_mapr_lock_acquire);

    if (rc != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
@@ -4029,7 +4028,7 @@ static int post_config(apr_pool_t *p, 
        return HTTP_INTERNAL_SERVER_ERROR;

    }



#ifdef MOD_REWRITE_SET_MUTEX_PERMS

#ifdef AP_NEED_SET_MUTEX_PERMS

    rv = unixd_set_global_mutex_perms(rewrite_log_lock);

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,

modules/ssl/ssl_engine_mutex.c

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
                                             -- Unknown     */



#include "ssl_private.h"

#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)



#ifdef AP_NEED_SET_MUTEX_PERMS

#include "unixd.h"

#define MOD_SSL_SET_MUTEX_PERMS /* XXX Apache should define something */

#endif



int ssl_mutex_init(server_rec *s, apr_pool_t *p)
@@ -57,7 +57,7 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p) 
        return FALSE;

    }



#ifdef MOD_SSL_SET_MUTEX_PERMS

#ifdef AP_NEED_SET_MUTEX_PERMS

    rv = unixd_set_global_mutex_perms(mc->pMutex);

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,

os/unix/os.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
#define PLATFORM "Unix"

#endif



/* On platforms where AP_NEED_SET_MUTEX_PERMS is defined, modules

 * should call unixd_set_*_mutex_perms on mutexes created in the

 * parent process. */

#define AP_NEED_SET_MUTEX_PERMS



#ifdef _OSD_POSIX

pid_t os_fork(const char *user);

#endif