Commit c2bdbf10 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

doh. need a spellchekker for these rename scripts. s/apr_lock_aquire/apr_lock_acquire/g; 


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

modules/aaa/mod_auth_digest.c

+3 −3
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static client_entry *get_client(unsigned long key, const request_rec *r) 
    bucket = key % client_list->tbl_len;

    entry  = client_list->table[bucket];



    apr_lock_aquire(client_lock /*, MM_LOCK_RD */);

    apr_lock_acquire(client_lock /*, MM_LOCK_RD */);



    while(entry && key != entry->key) {

	prev  = entry;
@@ -801,7 +801,7 @@ static client_entry *add_client(unsigned long key, client_entry *info, 
    bucket = key % client_list->tbl_len;

    entry  = client_list->table[bucket];



    apr_lock_aquire(client_lock /*, MM_LOCK_RW */);

    apr_lock_acquire(client_lock /*, MM_LOCK_RW */);



    /* try to allocate a new entry */
@@ -1056,7 +1056,7 @@ static client_entry *gen_client(const request_rec *r) 


    if (!opaque_cntr)  return NULL;



    apr_lock_aquire(opaque_lock /*, MM_LOCK_RW */);

    apr_lock_acquire(opaque_lock /*, MM_LOCK_RW */);

    op = (*opaque_cntr)++;

    apr_lock_release(opaque_lock);

modules/mappers/mod_rewrite.c

+11 −11
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static cache *cachep; 
static int proxy_available;



static const char *lockname;

static apr_lock_t *rewrite_mapr_lock_aquire = NULL;

static apr_lock_t *rewrite_mapr_lock_acquire = NULL;

static apr_lock_t *rewrite_log_lock = NULL;



/*
@@ -980,10 +980,10 @@ static void init_child(apr_pool_t *p, server_rec *s) 


    if (lockname != NULL && *(lockname) != '\0')

    {

        rv = apr_lock_child_init (&rewrite_mapr_lock_aquire, lockname, p);

        rv = apr_lock_child_init (&rewrite_mapr_lock_acquire, lockname, p);

        if (rv != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,

                         "mod_rewrite: could not init rewrite_mapr_lock_aquire "

                         "mod_rewrite: could not init rewrite_mapr_lock_acquire "

                         "in child");

        }

    }
@@ -2899,8 +2899,8 @@ static char *lookup_map_program(request_rec *r, apr_file_t *fpin, 


    /* take the lock */



    if (rewrite_mapr_lock_aquire) {

        apr_lock_aquire(rewrite_mapr_lock_aquire);

    if (rewrite_mapr_lock_acquire) {

        apr_lock_acquire(rewrite_mapr_lock_acquire);

    }



    /* write out the request key */
@@ -2934,8 +2934,8 @@ static char *lookup_map_program(request_rec *r, apr_file_t *fpin, 
    buf[i] = '\0';



    /* give the lock back */

    if (rewrite_mapr_lock_aquire) {

        apr_lock_release(rewrite_mapr_lock_aquire);

    if (rewrite_mapr_lock_acquire) {

        apr_lock_release(rewrite_mapr_lock_acquire);

    }



    if (strcasecmp(buf, "NULL") == 0) {
@@ -3186,7 +3186,7 @@ static void rewritelog(request_rec *r, int level, const char *text, ...) 
                (unsigned long)(r->server), (unsigned long)r,

                type, redir, level, str2);



    apr_lock_aquire(rewrite_log_lock);

    apr_lock_acquire(rewrite_log_lock);

    nbytes = strlen(str3);

    apr_file_write(conf->rewritelogfp, str3, &nbytes);

    apr_lock_release(rewrite_log_lock);
@@ -3236,7 +3236,7 @@ static void rewritelock_create(server_rec *s, apr_pool_t *p) 
    lockname = ap_server_root_relative(p, lockname);



    /* create the lockfile */

    rc = apr_lock_create (&rewrite_mapr_lock_aquire, APR_MUTEX, APR_LOCKALL, lockname, p);

    rc = apr_lock_create (&rewrite_mapr_lock_acquire, APR_MUTEX, APR_LOCKALL, lockname, p);

    if (rc != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, rc, s,

                     "mod_rewrite: Parent could not create RewriteLock "
@@ -3255,8 +3255,8 @@ static apr_status_t rewritelock_remove(void *data) 
    }



    /* destroy the rewritelock */

    apr_lock_destroy (rewrite_mapr_lock_aquire);

    rewrite_mapr_lock_aquire = NULL;

    apr_lock_destroy (rewrite_mapr_lock_acquire);

    rewrite_mapr_lock_acquire = NULL;

    lockname = NULL;

    return(0);

}

server/mpm/beos/beos.c

+3 −3
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int32 worker_thread(void * dummy) 


    apr_pool_create(&ptrans, tpool);



    apr_lock_aquire(worker_thread_count_mutex);

    apr_lock_acquire(worker_thread_count_mutex);

    worker_thread_count++;

    apr_lock_release(worker_thread_count_mutex);
@@ -363,7 +363,7 @@ static int32 worker_thread(void * dummy) 
        (void) ap_update_child_status(0, child_slot, SERVER_READY,

                                      (request_rec*)NULL);



        apr_lock_aquire(accept_mutex);

        apr_lock_acquire(accept_mutex);

        while (!this_worker_should_exit) {

            apr_int16_t event;

            apr_status_t ret = apr_poll(pollset, &srv, -1);
@@ -433,7 +433,7 @@ static int32 worker_thread(void * dummy) 


    ap_update_child_status(0, child_slot, SERVER_DEAD, (request_rec*)NULL);

    

    apr_lock_aquire(worker_thread_count_mutex);

    apr_lock_acquire(worker_thread_count_mutex);

    worker_thread_count--;

    apr_lock_release(worker_thread_count_mutex);

server/mpm/experimental/perchild/perchild.c

+2 −2
Original line number Diff line number Diff line
@@ -596,10 +596,10 @@ static void *worker_thread(void *arg) 
            pthread_mutex_unlock(&thread_accept_mutex);

            break;

        }

        if ((rv = SAFE_ACCEPT(apr_lock_aquire(process_accept_mutex)))

        if ((rv = SAFE_ACCEPT(apr_lock_acquire(process_accept_mutex)))

            != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,

                         "apr_lock_aquire failed. Attempting to shutdown "

                         "apr_lock_acquire failed. Attempting to shutdown "

                         "process gracefully.");

            workers_may_exit = 1;

        }

server/mpm/mpmt_pthread/mpmt_pthread.c

+2 −2
Original line number Diff line number Diff line
@@ -477,10 +477,10 @@ static void * worker_thread(void * dummy) 


        (void) ap_update_child_status(process_slot, thread_slot, SERVER_READY, 

                                      (request_rec *) NULL);

        if ((rv = SAFE_ACCEPT(apr_lock_aquire(accept_mutex)))

        if ((rv = SAFE_ACCEPT(apr_lock_acquire(accept_mutex)))

            != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,

                         "apr_lock_aquire failed. Attempting to shutdown "

                         "apr_lock_acquire failed. Attempting to shutdown "

                         "process gracefully.");

            workers_may_exit = 1;

        }