Mailing List Archive

svn commit: r1888928 - in /httpd/httpd/branches/2.4.x: modules/aaa/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/filters/ modules/generators/ modules/ldap/ modules/mappers/ modules/md/ modules/metadata/ mo...
Author: jailletc36
Date: Sun Apr 18 19:11:48 2021
New Revision: 1888928

URL: http://svn.apache.org/viewvc?rev=1888928&view=rev
Log:
Merge (most of) r1876599 from trunk

* Add missing pool tags to help debugging

Submitted by: ylavic
Reviewed by: jailletc36, gbechis, ylavic
Backported by: jailletc36

Modified:
httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c
httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c
httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c
httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c
httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c
httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
httpd/httpd/branches/2.4.x/modules/database/mod_dbd.c
httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c
httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c
httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c
httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c
httpd/httpd/branches/2.4.x/modules/md/md_acme.c
httpd/httpd/branches/2.4.x/modules/md/md_http.c
httpd/httpd/branches/2.4.x/modules/md/md_util.c
httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c
httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_uwsgi.c
httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c
httpd/httpd/branches/2.4.x/server/core.c
httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2_child.c
httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c
httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c
httpd/httpd/branches/2.4.x/server/mpm/winnt/nt_eventlog.c
httpd/httpd/branches/2.4.x/server/mpm_unix.c
httpd/httpd/branches/2.4.x/server/request.c

Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c Sun Apr 18 19:11:48 2021
@@ -714,6 +714,7 @@ static void req_rsp(request_rec *r, cons
}

apr_pool_create(&temp_pool, r->pool);
+ apr_pool_tag(temp_pool, "mod_authnz_fcgi (req_rsp)");

setupenv(r, password, apache_role);


Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c Sun Apr 18 19:11:48 2021
@@ -98,6 +98,8 @@ static apr_status_t groups_for_user(apr_
}

apr_pool_create(&sp, p);
+ apr_pool_tag(sp, "authz_groupfile (groups_for_user)");
+
ap_varbuf_init(p, &vb, VARBUF_INIT_LEN);

while (!(ap_varbuf_cfg_getline(&vb, f, VARBUF_MAX_LEN))) {

Modified: httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c Sun Apr 18 19:11:48 2021
@@ -1692,6 +1692,7 @@ static int isapi_pre_config(apr_pool_t *
"could not create the isapi cache pool");
return APR_EGENERAL;
}
+ apr_pool_tag(loaded.pool, "mod_isapi_load");

loaded.hash = apr_hash_make(loaded.pool);
if (!loaded.hash) {

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c Sun Apr 18 19:11:48 2021
@@ -471,6 +471,7 @@ static int open_entity(cache_handle_t *h
* about for the lifetime of the response.
*/
apr_pool_create(&sobj->pool, r->pool);
+ apr_pool_tag(sobj->pool, "mod_cache_socache (open_entity)");

sobj->buffer = apr_palloc(sobj->pool, dconf->max);
sobj->buffer_len = dconf->max;
@@ -800,6 +801,7 @@ static apr_status_t store_headers(cache_
: obj->info.expire + dconf->mintime;

apr_pool_create(&sobj->pool, r->pool);
+ apr_pool_tag(sobj->pool, "mod_cache_socache (store_headers)");

sobj->buffer = apr_palloc(sobj->pool, dconf->max);
sobj->buffer_len = dconf->max;

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_dbm.c Sun Apr 18 19:11:48 2021
@@ -92,6 +92,7 @@ static const char *socache_dbm_create(ap
}

apr_pool_create(&ctx->pool, p);
+ apr_pool_tag(ctx->pool, "socache_dbm_instance");

return NULL;
}

Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Sun Apr 18 19:11:48 2021
@@ -633,6 +633,7 @@ static apr_status_t hm_watchdog_callback
apr_interval_time_t timeout;

apr_pool_create(&p, pool);
+ apr_pool_tag(p, "hm_running");

pfd.desc_type = APR_POLL_SOCKET;
pfd.desc.s = ctx->sock;
@@ -807,6 +808,7 @@ static void *hm_create_config(apr_pool_t
ctx->interval = apr_time_from_sec(HM_UPDATE_SEC);
ctx->s = s;
apr_pool_create(&ctx->p, p);
+ apr_pool_tag(ctx->p, "hm_ctx");
ctx->servers = apr_hash_make(ctx->p);

return ctx;

Modified: httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c Sun Apr 18 19:11:48 2021
@@ -112,6 +112,7 @@ static void* APR_THREAD_FUNC wd_worker(a
int probed = 0;
int inited = 0;
int mpmq_s = 0;
+ apr_pool_t *ctx = NULL;

w->pool = apr_thread_pool_get(thread);
w->is_running = 1;
@@ -165,8 +166,8 @@ static void* APR_THREAD_FUNC wd_worker(a
w->singleton ? "Singleton " : "", w->name);
apr_time_clock_hires(w->pool);
if (wl) {
- apr_pool_t *ctx = NULL;
apr_pool_create(&ctx, w->pool);
+ apr_pool_tag(ctx, "wd_running");
while (wl && w->is_running) {
/* Execute watchdog callback */
wl->status = (*wl->callback_fn)(AP_WATCHDOG_STATE_STARTING,
@@ -183,7 +184,6 @@ static void* APR_THREAD_FUNC wd_worker(a

/* Main execution loop */
while (w->is_running) {
- apr_pool_t *ctx = NULL;
apr_time_t curr;
watchdog_list_t *wl = w->callbacks;

@@ -202,8 +202,10 @@ static void* APR_THREAD_FUNC wd_worker(a
if (wl->status == APR_SUCCESS) {
wl->step += (apr_time_now() - curr);
if (wl->step >= wl->interval) {
- if (!ctx)
+ if (!ctx) {
apr_pool_create(&ctx, w->pool);
+ apr_pool_tag(ctx, "wd_running");
+ }
wl->step = 0;
/* Execute watchdog callback */
wl->status = (*wl->callback_fn)(AP_WATCHDOG_STATE_RUNNING,
@@ -224,8 +226,10 @@ static void* APR_THREAD_FUNC wd_worker(a
*/
w->step += (apr_time_now() - curr);
if (w->step >= wd_interval) {
- if (!ctx)
+ if (!ctx) {
apr_pool_create(&ctx, w->pool);
+ apr_pool_tag(ctx, "wd_running");
+ }
w->step = 0;
/* Run watchdog step hook */
ap_run_watchdog_step(wd_server_conf->s, w->name, ctx);
@@ -441,6 +445,7 @@ static int wd_post_config_hook(apr_pool_
if (!(wd_server_conf = apr_pcalloc(ppconf, sizeof(wd_server_conf_t))))
return APR_ENOMEM;
apr_pool_create(&wd_server_conf->pool, ppconf);
+ apr_pool_tag(wd_server_conf->pool, "wd_server_conf");
apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, ppconf);
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(010033)

Modified: httpd/httpd/branches/2.4.x/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/database/mod_dbd.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/database/mod_dbd.c (original)
+++ httpd/httpd/branches/2.4.x/modules/database/mod_dbd.c Sun Apr 18 19:11:48 2021
@@ -525,6 +525,7 @@ static apr_status_t dbd_construct(void *
"Failed to create memory pool");
return rv;
}
+ apr_pool_tag(rec_pool, "dbd_rec_pool");

rec = apr_pcalloc(rec_pool, sizeof(ap_dbd_t));

@@ -589,6 +590,7 @@ static apr_status_t dbd_construct(void *
apr_pool_destroy(rec->pool);
return rv;
}
+ apr_pool_tag(prepared_pool, "dbd_prepared_pool");

rv = dbd_prepared_init(prepared_pool, cfg, rec);
if (rv != APR_SUCCESS) {
@@ -673,6 +675,7 @@ static apr_status_t dbd_setup_init(apr_p
"Failed to create reslist cleanup memory pool");
return rv2;
}
+ apr_pool_tag(group->pool, "dbd_group");

#if APR_HAS_THREADS
rv2 = dbd_setup(s, group);

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_include.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_include.c Sun Apr 18 19:11:48 2021
@@ -3855,6 +3855,7 @@ static apr_status_t includes_filter(ap_f
ctx->intern = intern = apr_palloc(r->pool, sizeof(*ctx->intern));
ctx->pool = r->pool;
apr_pool_create(&ctx->dpool, ctx->pool);
+ apr_pool_tag(ctx->dpool, "includes_dpool");

/* runtime data */
intern->tmp_bb = apr_brigade_create(ctx->pool, f->c->bucket_alloc);

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c Sun Apr 18 19:11:48 2021
@@ -254,6 +254,7 @@ static apr_status_t init_context(ap_filt
ctx->bufsize = MODSED_OUTBUF_SIZE;
if (usetpool) {
apr_pool_create(&(ctx->tpool), r->pool);
+ apr_pool_tag(ctx->tpool, "sed_tpool");
}
else {
ctx->tpool = r->pool;

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_substitute.c Sun Apr 18 19:11:48 2021
@@ -402,6 +402,7 @@ static apr_status_t substitute_filter(ap
ctx->passbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
/* Create our temporary pool only once */
apr_pool_create(&(ctx->tpool), f->r->pool);
+ apr_pool_tag(ctx->tpool, "substitute_tpool");
apr_table_unset(f->r->headers_out, "Content-Length");
}


Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c Sun Apr 18 19:11:48 2021
@@ -1517,6 +1517,7 @@ static void output_directories(struct en
char *breakrow = "";

apr_pool_create(&scratch, r->pool);
+ apr_pool_tag(scratch, "autoindex_scratch");

name_width = d->name_width;
desc_width = d->desc_width;

Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Sun Apr 18 19:11:48 2021
@@ -608,6 +608,7 @@ static int cgid_server(void *data)
apr_status_t rv;

apr_pool_create(&ptrans, pcgi);
+ apr_pool_tag(ptrans, "cgid_ptrans");

apr_signal(SIGCHLD, SIG_IGN);
apr_signal(SIGHUP, daemon_signal_handler);
@@ -879,6 +880,7 @@ static int cgid_start(apr_pool_t *p, ser
else if (daemon_pid == 0) {
if (pcgi == NULL) {
apr_pool_create(&pcgi, p);
+ apr_pool_tag(pcgi, "cgid_pcgi");
}
exit(cgid_server(main_server) > 0 ? DAEMON_STARTUP_ERROR : -1);
}

Modified: httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ldap/util_ldap.c Sun Apr 18 19:11:48 2021
@@ -817,6 +817,7 @@ static util_ldap_connection_t *
#endif
return NULL;
}
+ apr_pool_tag(newpool, "util_ldap_connection");

/*
* Add the new connection entry to the linked list. Note that we
@@ -864,6 +865,7 @@ static util_ldap_connection_t *
#endif
return NULL;
}
+ apr_pool_tag(l->rebind_pool, "util_ldap_rebind");
}

if (p) {
@@ -2810,6 +2812,7 @@ static void *util_ldap_create_config(apr
* no shared memory managed by either.
*/
apr_pool_create(&st->pool, p);
+ apr_pool_tag(st->pool, "util_ldap_state");
#if APR_HAS_THREADS
apr_thread_mutex_create(&st->mutex, APR_THREAD_MUTEX_DEFAULT, st->pool);
#endif

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Sun Apr 18 19:11:48 2021
@@ -1029,6 +1029,7 @@ static void set_cache_value(const char *
#endif
return;
}
+ apr_pool_tag(p, "rewrite_cachedmap");

map = apr_palloc(cachep->pool, sizeof(cachedmap));
map->pool = p;
@@ -1106,6 +1107,7 @@ static int init_cache(apr_pool_t *p)
cachep = NULL; /* turns off cache */
return 0;
}
+ apr_pool_tag(cachep->pool, "rewrite_cachep");

cachep->maps = apr_hash_make(cachep->pool);
#if APR_HAS_THREADS

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_speling.c Sun Apr 18 19:11:48 2021
@@ -425,6 +425,7 @@ static int check_speling(request_rec *r)

if (apr_pool_create(&sub_pool, p) != APR_SUCCESS)
return DECLINED;
+ apr_pool_tag(sub_pool, "speling_sub");

t = apr_array_make(sub_pool, candidates->nelts * 8 + 8,
sizeof(char *));

Modified: httpd/httpd/branches/2.4.x/modules/md/md_acme.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/md/md_acme.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/md/md_acme.c (original)
+++ httpd/httpd/branches/2.4.x/modules/md/md_acme.c Sun Apr 18 19:11:48 2021
@@ -121,6 +121,7 @@ static md_acme_req_t *md_acme_req_create
if (rv != APR_SUCCESS) {
return NULL;
}
+ apr_pool_tag(pool, "md_acme_req");

req = apr_pcalloc(pool, sizeof(*req));
if (!req) {

Modified: httpd/httpd/branches/2.4.x/modules/md/md_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/md/md_http.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/md/md_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/md/md_http.c Sun Apr 18 19:11:48 2021
@@ -169,6 +169,7 @@ static apr_status_t req_create(md_http_r
if (rv != APR_SUCCESS) {
return rv;
}
+ apr_pool_tag(pool, "md_http_req");

req = apr_pcalloc(pool, sizeof(*req));
req->pool = pool;

Modified: httpd/httpd/branches/2.4.x/modules/md/md_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/md/md_util.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/md/md_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/md/md_util.c Sun Apr 18 19:11:48 2021
@@ -37,8 +37,8 @@ apr_status_t md_util_pool_do(md_util_act
apr_pool_t *ptemp;
apr_status_t rv = apr_pool_create(&ptemp, p);
if (APR_SUCCESS == rv) {
+ apr_pool_tag(ptemp, "md_pool_do");
rv = cb(baton, p, ptemp);
-
apr_pool_destroy(ptemp);
}
return rv;
@@ -51,6 +51,7 @@ static apr_status_t pool_vado(md_util_va

rv = apr_pool_create(&ptemp, p);
if (APR_SUCCESS == rv) {
+ apr_pool_tag(ptemp, "md_pool_vado");
rv = cb(baton, p, ptemp, ap);
apr_pool_destroy(ptemp);
}

Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_mime_magic.c Sun Apr 18 19:11:48 2021
@@ -2181,6 +2181,7 @@ static int uncompress(request_rec *r, in
*/
if (apr_pool_create(&sub_context, r->pool) != APR_SUCCESS)
return -1;
+ apr_pool_tag(sub_context, "magic_uncompress");

if ((rv = create_uncompress_child(&parm, sub_context, &pipe_out)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01553)

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Sun Apr 18 19:11:48 2021
@@ -281,6 +281,7 @@ static proxy_worker *find_best_hb(proxy_
}

apr_pool_create(&tpool, r->pool);
+ apr_pool_tag(tpool, "lb_heartbeat_tpool");

servers = apr_hash_make(tpool);


Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Sun Apr 18 19:11:48 2021
@@ -873,6 +873,7 @@ static int proxy_walk(request_rec *r)
if (entry_proxy->refs && entry_proxy->refs->nelts) {
if (!rxpool) {
apr_pool_create(&rxpool, r->pool);
+ apr_pool_tag(rxpool, "proxy_rxpool");
}
nmatch = entry_proxy->refs->nelts;
pmatch = apr_palloc(rxpool, nmatch*sizeof(ap_regmatch_t));

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c Sun Apr 18 19:11:48 2021
@@ -977,6 +977,7 @@ static int fcgi_do_request(apr_pool_t *p
}

apr_pool_create(&temp_pool, r->pool);
+ apr_pool_tag(temp_pool, "proxy_fcgi_do_request");

/* Step 2: Send Environment via FCGI_PARAMS */
rv = send_environment(conn, r, temp_pool, request_id);

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Sun Apr 18 19:11:48 2021
@@ -716,6 +716,7 @@ static request_rec *make_fake_req(conn_r
request_rec *rp;

apr_pool_create(&pool, c->pool);
+ apr_pool_tag(pool, "proxy_http_rp");

rp = apr_pcalloc(pool, sizeof(*r));


Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_uwsgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_uwsgi.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_uwsgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_uwsgi.c Sun Apr 18 19:11:48 2021
@@ -247,6 +247,7 @@ static request_rec *make_fake_req(conn_r
request_rec *rp;

apr_pool_create(&pool, c->pool);
+ apr_pool_tag(pool, "proxy_uwsgi_rp");

rp = apr_pcalloc(pool, sizeof(*r));


Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Sun Apr 18 19:11:48 2021
@@ -1342,6 +1342,7 @@ static proxy_worker *proxy_balancer_get_
balancer->lbmethod->name, balancer->s->name);

apr_pool_create(&tpool, r->pool);
+ apr_pool_tag(tpool, "proxy_lb_best");

spares = apr_array_make(tpool, 1, sizeof(proxy_worker*));
standbys = apr_array_make(tpool, 1, sizeof(proxy_worker*));
@@ -2013,6 +2014,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
if (APLOGdebug(ap_server_conf)) {
apr_pool_t *pool;
apr_pool_create(&pool, ap_server_conf->process->pool);
+ apr_pool_tag(pool, "proxy_worker_name");
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02338)
"%s shm[%d] (0x%pp) for worker: %s", action, i, (void *)shm,
ap_proxy_worker_name(pool, worker));

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_ocsp.c Sun Apr 18 19:11:48 2021
@@ -284,6 +284,7 @@ int modssl_verify_ocsp(X509_STORE_CTX *c
/* Create a temporary pool to constrain memory use (the passed-in
* pool may be e.g. a connection pool). */
apr_pool_create(&vpool, pool);
+ apr_pool_tag(vpool, "modssl_verify_ocsp");

rv = verify_ocsp_status(cert, ctx, c, sc, s, vpool);


Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c Sun Apr 18 19:11:48 2021
@@ -298,6 +298,7 @@ static struct CRYPTO_dynlock_value *ssl_
* away in the destruction callback.
*/
apr_pool_create(&p, dynlockpool);
+ apr_pool_tag(p, "modssl_dynlock_value");
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE1, 0, p,
"Creating dynamic lock");


Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_util_stapling.c Sun Apr 18 19:11:48 2021
@@ -526,6 +526,7 @@ static BOOL stapling_renew_response(serv

/* Create a temporary pool to constrain memory use */
apr_pool_create(&vpool, conn->pool);
+ apr_pool_tag(vpool, "modssl_stapling_renew");

if (apr_uri_parse(vpool, ocspuri, &uri) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01939)

Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Sun Apr 18 19:11:48 2021
@@ -721,6 +721,7 @@ void ap_core_reorder_directories(apr_poo

/* we have to allocate tmp space to do a stable sort */
apr_pool_create(&tmp, p);
+ apr_pool_tag(tmp, "core_reorder_directories");
sortbin = apr_palloc(tmp, sec_dir->nelts * sizeof(*sortbin));
for (i = 0; i < nelts; ++i) {
sortbin[i].orig_index = i;

Modified: httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2_child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2_child.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2_child.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2_child.c Sun Apr 18 19:11:48 2021
@@ -200,6 +200,7 @@ void ap_mpm_child_main(apr_pool_t *pconf
int last_poll_idx = 0;

apr_pool_create(&pconn, pchild);
+ apr_pool_tag(pconn, "transaction");
worker_args = apr_palloc(pconn, sizeof(worker_args_t));
worker_args->pconn = pconn;


Modified: httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c Sun Apr 18 19:11:48 2021
@@ -896,6 +896,7 @@ static int netware_run(apr_pool_t *_pcon
set_signals();

apr_pool_create(&pmain, pconf);
+ apr_pool_tag(pmain, "pmain");
ap_run_child_init(pmain, ap_server_conf);

if (ap_threads_max_free < ap_threads_min_free + 1) /* Don't thrash... */

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c Sun Apr 18 19:11:48 2021
@@ -559,6 +559,7 @@ static int create_process(apr_pool_t *p,
int envc;

apr_pool_create_ex(&ptemp, p, NULL, NULL);
+ apr_pool_tag(ptemp, "create_process");

/* Build the command line. Should look something like this:
* C:/apache/bin/httpd.exe -f ap_server_confname

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/nt_eventlog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/nt_eventlog.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/nt_eventlog.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/nt_eventlog.c Sun Apr 18 19:11:48 2021
@@ -39,6 +39,7 @@ static DWORD WINAPI service_stderr_threa
apr_pool_t *p;

apr_pool_create_ex(&p, NULL, NULL, NULL);
+ apr_pool_tag(p, "service_stderr_thread");

errarg[0] = "The Apache service named";
errarg[1] = display_name;

Modified: httpd/httpd/branches/2.4.x/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_unix.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm_unix.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm_unix.c Sun Apr 18 19:11:48 2021
@@ -632,6 +632,7 @@ static apr_status_t dummy_connection(ap_
if (rv != APR_SUCCESS) {
return rv;
}
+ apr_pool_tag(p, "dummy_connection");

/* If possible, find a listener which is configured for
* plain-HTTP, not SSL; using an SSL port would either be

Modified: httpd/httpd/branches/2.4.x/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/request.c?rev=1888928&r1=1888927&r2=1888928&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/request.c (original)
+++ httpd/httpd/branches/2.4.x/server/request.c Sun Apr 18 19:11:48 2021
@@ -1264,6 +1264,7 @@ AP_DECLARE(int) ap_directory_walk(reques
if (entry_core->refs && entry_core->refs->nelts) {
if (!rxpool) {
apr_pool_create(&rxpool, r->pool);
+ apr_pool_tag(rxpool, "directory_walk_rxpool");
}
nmatch = entry_core->refs->nelts;
pmatch = apr_palloc(rxpool, nmatch*sizeof(ap_regmatch_t));
@@ -1481,6 +1482,7 @@ AP_DECLARE(int) ap_location_walk(request
if (entry_core->refs && entry_core->refs->nelts) {
if (!rxpool) {
apr_pool_create(&rxpool, r->pool);
+ apr_pool_tag(rxpool, "location_walk_rxpool");
}
nmatch = entry_core->refs->nelts;
pmatch = apr_palloc(rxpool, nmatch*sizeof(ap_regmatch_t));
@@ -1683,6 +1685,7 @@ AP_DECLARE(int) ap_file_walk(request_rec
if (entry_core->refs && entry_core->refs->nelts) {
if (!rxpool) {
apr_pool_create(&rxpool, r->pool);
+ apr_pool_tag(rxpool, "file_walk_rxpool");
}
nmatch = entry_core->refs->nelts;
pmatch = apr_palloc(rxpool, nmatch*sizeof(ap_regmatch_t));