Commit eeaa14d8 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Switch proc_pthread to pthread for the AcceptMutex directive. 


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.26-dev



  *) Switch proc_pthread AcceptMutex configuration directive to pthread to 

     be consistent with 1.3.  [Justin Erenkrantz]



  *) Cache apr_explode_localtime() value for 15 seconds.

     [Brian Pane <bpane@pacbell.net>]

server/mpm_common.c

+2 −2
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ AP_DECLARE(const char *) ap_mpm_set_accept_lock_mech(cmd_parms *cmd, 
    }

#endif

#if APR_HAS_PROC_PTHREAD_SERIALIZE

    else if (!strcasecmp(arg, "proc_pthread")) {

    else if (!strcasecmp(arg, "pthread")) {

        ap_accept_lock_mech = APR_LOCK_PROC_PTHREAD;

    }

#endif
@@ -621,7 +621,7 @@ AP_DECLARE(const char *) ap_mpm_set_accept_lock_mech(cmd_parms *cmd, 
                           ", sysvsem"

#endif

#if APR_HAS_PROC_PTHREAD_SERIALIZE

                           ", proc_pthread"

                           ", pthread"

#endif

                           , NULL);

    }