Commit c1a26606 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

namespace-protect accept_lock_mech 

fix a bug in the worker MPM which effectively disabled the AcceptMutex
directive


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

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ const char *ap_mpm_set_lockfile(cmd_parms *cmd, void *dummy, 
 * The system mutex implementation to use for the accept mutex.

 */

#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH

extern apr_lockmech_e_np accept_lock_mech;

extern apr_lockmech_e_np ap_accept_lock_mech;

const char *ap_mpm_set_accept_lock_mech(cmd_parms *cmd, void *dummy,

                                        const char *arg);

#endif

server/mpm/experimental/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
                             ap_server_root_relative(_pconf, ap_lock_fname),

                             my_pid);

    rv = SAFE_ACCEPT(apr_lock_create_np(&process_accept_mutex, APR_MUTEX,

                                        APR_CROSS_PROCESS, accept_lock_mech,

                                        APR_CROSS_PROCESS, ap_accept_lock_mech,

                                        ap_lock_fname, _pconf));

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,

server/mpm/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
                             ap_server_root_relative(_pconf, ap_lock_fname),

                             my_pid);

    rv = SAFE_ACCEPT(apr_lock_create_np(&process_accept_mutex, APR_MUTEX,

                                        APR_CROSS_PROCESS, accept_lock_mech,

                                        APR_CROSS_PROCESS, ap_accept_lock_mech,

                                        ap_lock_fname, _pconf));

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,

server/mpm/prefork/prefork.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void accept_mutex_init(apr_pool_t *p) 


    expand_lock_fname(p);

    rv = apr_lock_create_np(&accept_lock, APR_MUTEX, APR_CROSS_PROCESS, 

                            accept_lock_mech, ap_lock_fname, p);

                            ap_accept_lock_mech, ap_lock_fname, p);

    if (rv) {

	ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "couldn't create accept mutex");

        exit(APEXIT_INIT);

server/mpm/threaded/threaded.c

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
                                 ap_server_root_relative(_pconf, ap_lock_fname),

                                 ap_my_pid);

    rv = apr_lock_create_np(&accept_mutex, APR_MUTEX, APR_LOCKALL,

                            accept_lock_mech, ap_lock_fname, _pconf);

                            ap_accept_lock_mech, ap_lock_fname, _pconf);

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,

                     "Couldn't create accept lock");