svn commit: r609863 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_connection.c ftp_limitlogin.c ftp_protocol.c

[wr...@apache.org]

Author: wrowe
Date: Mon Jan  7 20:10:12 2008
New Revision: 609863

URL: http://svn.apache.org/viewvc?rev=609863&view=rev
Log:
As I'm debugging some changes on vhosts and allocations, it's very helpful
if each of the pools in ftp are tagged.

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=609863&r1=609862&r2=609863&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Mon Jan  7 20:10:12 2008
@@ -57,7 +57,9 @@
     fc->rename_from[0]   = '\0';
 
     apr_pool_create(&fc->login_pool, c->pool);
+    apr_pool_tag(fc->login_pool, "login");
     apr_pool_create(&fc->data_pool, c->pool);
+    apr_pool_tag(fc->data_pool, "data");
 
     fc->cntlsock  = ap_get_module_config(c->conn_config, &core_module);
 

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c?rev=609863&r1=609862&r2=609863&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Mon Jan  7 20:10:12 2008
@@ -130,6 +130,7 @@
     if (ftp_lock) {
         apr_global_mutex_destroy(ftp_lock);
         apr_pool_create_ex(&p, s->process->pool, NULL, NULL);
+        apr_pool_tag(p, "ftp_mutex");
         if (p) {
             unlink(apr_pstrcat(p, fsc->limitdbfile, ".db", NULL));
             unlink(apr_pstrcat(p, fsc->limitdbfile, ".dir", NULL));

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=609863&r1=609862&r2=609863&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Mon Jan  7 20:10:12 2008
@@ -330,6 +330,7 @@
 
     if (!fc->next_pool) {
         apr_pool_create(&fc->next_pool, fc->connection->pool);
+        apr_pool_tag(fc->next_pool, "next_cmd");
         fc->next_bb = apr_brigade_create(fc->next_pool, 
                                          fc->connection->bucket_alloc);
 #ifdef FTP_TRACE
@@ -420,6 +421,7 @@
     ap_filter_t *f;
 
     apr_pool_create(&p, c->pool);
+    apr_pool_tag(p, "request");
     r = apr_pcalloc(p, sizeof(request_rec));
 
     r->pool = p;