Merge (most of) r1876599 from trunk

   * Add missing pool tags to help debugging

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1888928 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_authnz_fcgi.c b/modules/aaa/mod_authnz_fcgi.c
index 72f6a8d75684afbe809a1da60af0b726b0e4dc67..1aadcc2e97ac9d3026a947a1165f40a572508369 100644 (file)
--- a/modules/aaa/mod_authnz_fcgi.c
+++ b/modules/aaa/mod_authnz_fcgi.c
@@ -714,6 +714,7 @@ static void req_rsp(request_rec *r, const fcgi_provider_conf *conf,
     }
 
     apr_pool_create(&temp_pool, r->pool);
+    apr_pool_tag(temp_pool, "mod_authnz_fcgi (req_rsp)");
 
     setupenv(r, password, apache_role);
 

diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
index 88c6cf0f3e4c33755361d259477c6c1d96adf620..c2431e05b7953dfe23b7a93d8aad43626b3ccc50 100644 (file)
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -98,6 +98,8 @@ static apr_status_t groups_for_user(apr_pool_t *p, char *user, char *grpfile,
     }
 
     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))) {

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 23e6a68a549c390a2d3c0e464e0d95baffa4fcf0..5592a5744e96b79d42108ec23fe95cf4e7e597fa 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -1692,6 +1692,7 @@ static int isapi_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
                      "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) {

diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index 978b8b78e77e9173d266a450efc9eb1807ae6bda..f369004a417c4df3ccbac60d62bf11f9bc2b32c5 100644 (file)
--- a/modules/cache/mod_cache_socache.c
+++ b/modules/cache/mod_cache_socache.c
@@ -471,6 +471,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
      * 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_handle_t *h, request_rec *r,
                     : 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;

diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c
index 579d2ffecdfc3337539ceb8fff42b224431f9d60..67246457cd9871c5808823018da323e3edd66bbc 100644 (file)
--- a/modules/cache/mod_socache_dbm.c
+++ b/modules/cache/mod_socache_dbm.c
@@ -92,6 +92,7 @@ static const char *socache_dbm_create(ap_socache_instance_t **context,
     }
 
     apr_pool_create(&ctx->pool, p);
+    apr_pool_tag(ctx->pool, "socache_dbm_instance");
 
     return NULL;
 }

diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 61a851764d03f3dc3a7cda16097ccec6ef08db43..2e8d12dd2e6bbb2fffa4ebd3206fc241a2524fc1 100644 (file)
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -633,6 +633,7 @@ static apr_status_t hm_watchdog_callback(int state, void *data,
                 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 *p, server_rec *s)
     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;

diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index bc05e8521150b5f07b4dc5456a140dc3710289f3..d833939cb0ac7ca79fd4bc338e99b37ade4496af 100644 (file)
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -112,6 +112,7 @@ static void* APR_THREAD_FUNC wd_worker(apr_thread_t *thread, void *data)
     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(apr_thread_t *thread, void *data)
                      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(apr_thread_t *thread, void *data)
 
     /* 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(apr_thread_t *thread, void *data)
             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(apr_thread_t *thread, void *data)
              */
             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_t *pconf, apr_pool_t *plog,
         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)

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 72126652e20d621015af97420c5cb20767b84009..aa6b76489ff4a0d5549010ff52754fe41c81cec7 100644 (file)
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -525,6 +525,7 @@ static apr_status_t dbd_construct(void **data_ptr,
                      "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 **data_ptr,
         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_pool_t *pool, server_rec *s)
                          "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);

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 9f69d8adf931643a85b0ca693f2956d683510780..584d8fb311fa20ee490f1045c301dfc927ea1076 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3855,6 +3855,7 @@ static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b)
         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);

diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c
index 346c210349dbac56fa06b19177969f709c78f84b..9b408029a866e626009405c1b2c6d116c1b591ce 100644 (file)
--- a/modules/filters/mod_sed.c
+++ b/modules/filters/mod_sed.c
@@ -254,6 +254,7 @@ static apr_status_t init_context(ap_filter_t *f, sed_expr_config *sed_cfg, int u
     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;

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 960490149c75b4d971ede3ffe136527799c2940f..d454bf347cfb6b3f87af7edb0bcefd589cfe80c9 100644 (file)
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -402,6 +402,7 @@ static apr_status_t substitute_filter(ap_filter_t *f, apr_bucket_brigade *bb)
         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");
     }
 

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index c887056312d780b64c8f1cafaac16085ca6f8f82..28ed85a8f3e05471459cd46551eda63e44bed2eb 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1517,6 +1517,7 @@ static void output_directories(struct ent **ar, int n,
     char *breakrow = "";
 
     apr_pool_create(&scratch, r->pool);
+    apr_pool_tag(scratch, "autoindex_scratch");
 
     name_width = d->name_width;
     desc_width = d->desc_width;

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 9f4282cf9624fd78aed054f1f42175e692ec3642..591758dadbbe516afe2bc840a3695b82ba8a2126 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -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, server_rec *main_server,
     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);
     }

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 16bcc3d2bcd007b05c8ae423d46c7bb75141a785..120f268f142ba99d2670fd1e4cf22666bd9676d9 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -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_pool_t *p, server_rec *s)
      * 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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index c0be4f686ba4ea8f86847a892580c7e60a74233c..989244d43e036bd356272521809913e72a1c6cbc 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1029,6 +1029,7 @@ static void set_cache_value(const char *name, apr_time_t t, char *key,
 #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

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 3e974232551a0117093fbb71d00337162a11840e..a0b2d2a38937c31b8a8339eadebb3d24e79d87d8 100644 (file)
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -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 *));

diff --git a/modules/md/md_acme.c b/modules/md/md_acme.c
index d42ea72230c6c9f28a92712d04d9508cbeaf1a8f..c085ba351846e0e1eda725310571ba83e69e2770 100644 (file)
--- a/modules/md/md_acme.c
+++ b/modules/md/md_acme.c
@@ -121,6 +121,7 @@ static md_acme_req_t *md_acme_req_create(md_acme_t *acme, const char *method, co
     if (rv != APR_SUCCESS) {
         return NULL;
     }
+    apr_pool_tag(pool, "md_acme_req");
     
     req = apr_pcalloc(pool, sizeof(*req));
     if (!req) {

diff --git a/modules/md/md_http.c b/modules/md/md_http.c
index bafa5913fd35d7ac57ba929f44d187ec707b8361..9c2790cd66a99f014bf4712d06f96226190d0e91 100644 (file)
--- a/modules/md/md_http.c
+++ b/modules/md/md_http.c
@@ -169,6 +169,7 @@ static apr_status_t req_create(md_http_request_t **preq, md_http_t *http,
     if (rv != APR_SUCCESS) {
         return rv;
     }
+    apr_pool_tag(pool, "md_http_req");
     
     req = apr_pcalloc(pool, sizeof(*req));
     req->pool = pool;

diff --git a/modules/md/md_util.c b/modules/md/md_util.c
index 6bf65e175dfcc6ca85d6199e737b2e505a0ccf1b..25830f2b92ddce37945f00ddac313212c33ed72d 100644 (file)
--- a/modules/md/md_util.c
+++ b/modules/md/md_util.c
@@ -37,8 +37,8 @@ apr_status_t md_util_pool_do(md_util_action *cb, void *baton, apr_pool_t *p)
     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_vaction *cb, void *baton, apr_pool_t *p, v
     
     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);
     }

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index b755cd2ed29e0ae0c3b9afcb9b254c5040e65954..7dac4fdbd3d1a5bc2830d7f0452209d840b8a414 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2181,6 +2181,7 @@ static int uncompress(request_rec *r, int method,
      */
     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)

diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index 7aeaf71248549f24de03247fa769a9627df777a2..412bac420e680ca327b153b078a147922e2ed10a 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -281,6 +281,7 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer,
     }
 
     apr_pool_create(&tpool, r->pool);
+    apr_pool_tag(tpool, "lb_heartbeat_tpool");
 
     servers = apr_hash_make(tpool);
 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 3d04dc9cff01526bce7a436b222cd37c0d7f0069..1cc7b754fd2d3453f04e977dee2d07abff4ae5fc 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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));

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index d2d06dd3c147ae8c54beb40a4b94151cb0bda3fa..3382b9bfd5c837c0bbe6e7b9f3aff7cd3206676c 100644 (file)
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -977,6 +977,7 @@ static int fcgi_do_request(apr_pool_t *p, request_rec *r,
     }
 
     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);

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 2fe8fdf1e1ee5d85af9f1d4c8d4aaa4ec4b93f0c..31fdf43d77faa811a99099b38838f40de713cc48 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -716,6 +716,7 @@ static request_rec *make_fake_req(conn_rec *c, request_rec *r)
     request_rec *rp;
 
     apr_pool_create(&pool, c->pool);
+    apr_pool_tag(pool, "proxy_http_rp");
 
     rp = apr_pcalloc(pool, sizeof(*r));
 

diff --git a/modules/proxy/mod_proxy_uwsgi.c b/modules/proxy/mod_proxy_uwsgi.c
index af119cddcbd3c2397d6e72589637d0c126bc1797..9db608aeca370c3a8113c6cbd34b81bb6c8f341e 100644 (file)
--- a/modules/proxy/mod_proxy_uwsgi.c
+++ b/modules/proxy/mod_proxy_uwsgi.c
@@ -247,6 +247,7 @@ static request_rec *make_fake_req(conn_rec *c, request_rec *r)
     request_rec *rp;
 
     apr_pool_create(&pool, c->pool);
+    apr_pool_tag(pool, "proxy_uwsgi_rp");
 
     rp = apr_pcalloc(pool, sizeof(*r));
 

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index c9d473563d935ef136b2ae2541705e4257b9ecea..bfb2d9fae61484dad225c5a76a919ce8f1193ad8 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1342,6 +1342,7 @@ static proxy_worker *proxy_balancer_get_best_worker(proxy_balancer *balancer,
                  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_share_worker(proxy_worker *worker, proxy_wo
     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));

diff --git a/modules/ssl/ssl_engine_ocsp.c b/modules/ssl/ssl_engine_ocsp.c
index 5c6a205057c22a7cce711562ecc105a097dc7897..5e045125585309243a70e8fdccae5e537065990f 100644 (file)
--- a/modules/ssl/ssl_engine_ocsp.c
+++ b/modules/ssl/ssl_engine_ocsp.c
@@ -284,6 +284,7 @@ int modssl_verify_ocsp(X509_STORE_CTX *ctx, SSLSrvConfigRec *sc,
     /* 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);
 

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 223b385e8e41e8de28cac4f6d786bdc12c407ab8..c88929518b46ece714c72f22b743d29a3547f161 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -298,6 +298,7 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
      * 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");
 

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index 15415934972f2cd44e25162b0a020a76846ee97c..4ba071e463e028a16c9521cf558bb12239b51fd1 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -526,6 +526,7 @@ static BOOL stapling_renew_response(server_rec *s, modssl_ctx_t *mctx, SSL *ssl,
 
     /* 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)

diff --git a/server/core.c b/server/core.c
index fe3a16f7fd869fce23fe23aa2cfc5673e3102fa1..f3f6abc3adcf21415602957467d40d6e4345b68d 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -721,6 +721,7 @@ void ap_core_reorder_directories(apr_pool_t *p, server_rec *s)
 
     /* 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;

diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index bb7e1369ea541767c69083d1697eaf032f02f150..f405cd2ea9eb508581ccfb0fb47e32d25f9f69c3 100644 (file)
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -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;
 

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 82480334b8e7e8c2a84cb9872ab327a740ea3af9..e89fdef3704d1a23c997f7552508838446bac376 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -896,6 +896,7 @@ static int netware_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     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... */

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index f4cb6e027e2a78e4348a50ce2e4309336cdd1ffd..38e13c183c1f895287d354845a6aa6c3c19720d9 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -559,6 +559,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     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

diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c
index e7e80d0dcd123880113bfc566641f7a9d6469d48..cd49ee652775552f00c688bbf9ce6e4a5b3430d2 100644 (file)
--- a/server/mpm/winnt/nt_eventlog.c
+++ b/server/mpm/winnt/nt_eventlog.c
@@ -39,6 +39,7 @@ static DWORD WINAPI service_stderr_thread(LPVOID hPipe)
     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;

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index d21c7e0e5149ff2c98313963b00a0455a73e1feb..8c4d233792d616d6d9244e47f1a628b26a12297e 100644 (file)
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -632,6 +632,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
     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

diff --git a/server/request.c b/server/request.c
index d5c558afa3005116e2ed5d10fe360909a15fdbf8..0f150a763d6b1130adbd1eba8c8a6081ca8b48e0 100644 (file)
--- a/server/request.c
+++ b/server/request.c
@@ -1264,6 +1264,7 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
             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_rec *r)
                 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 *r)
                 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));