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

    Use the _setn flavor which will avoid strdup'ing these strings, and
    skip the cleanups we don't need.

Submitted by: Brian Pane <bpane@pacbell.net>


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

modules/loggers/mod_log_config.c

+2 −2
Original line number Diff line number Diff line
@@ -1024,8 +1024,8 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p, 
     */

    apr_pool_userdata_get(&data, userdata_key, s->process->pool);

    if (!data) {

        apr_pool_userdata_set((const void *)1, userdata_key,

                         apr_pool_cleanup_null, s->process->pool);

        apr_pool_userdata_setn((const void *)1, userdata_key,

                               NULL, s->process->pool);

        /* If logging for the first time after a restart, keep going. */

        if (!ap_my_generation) {

            return cls;

server/request.c

+1 −2
Original line number Diff line number Diff line
@@ -328,8 +328,7 @@ static walk_cache_t *prep_walk_cache(const char *cache_name, request_rec *r) 
            cache = apr_pcalloc(r->pool, sizeof(*cache));

            cache->walked = apr_array_make(r->pool, 4, sizeof(walk_walked_t));

        }

        apr_pool_userdata_set(cache, cache_name, 

                              apr_pool_cleanup_null, r->pool);

        apr_pool_userdata_setn(cache, cache_name, NULL, r->pool);

    }

    return cache;

}