From: Jeff Trawick <trawick@apache.org>
Date: Sat, 1 Nov 2003 16:09:29 +0000 (+0000)
Subject: backport this from Apache 2.1-dev:
X-Git-Tag: 2.0.49~414
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc4c3254c24849197dec614208e383fc1c75c8b7;p=thirdparty%2Fapache%2Fhttpd.git

backport this from Apache 2.1-dev:

  Tag the pools created for requests and subrequests.

Reviewed by:   striker, nd


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

diff --git a/STATUS b/STATUS
index 0291e8aac51..189124137a0 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/01 15:54:15 $]
+Last modified at [$Date: 2003/11/01 16:09:29 $]
 
 Release:
 
@@ -276,16 +276,6 @@ PATCHES TO BACKPORT FROM 2.1
        0: nd
          nd: can the local_addr->port ever be 0?
 
-    * Tag the pools created for requests and subrequests.
-        server/request.c r1.129
-        server/protocol.c r1.137
-      +1: trawick, striker, nd
-         nd: I'm not really sure, what is it good for. What is it good for? ;-)
-         trawick: It is a minor debug aid.  If you're debugging/tracing some
-           apr operation or other utility routine, it is nice to display/trace
-           the pool tag and know whether or not it is the [sub-]request pool.
-	 nd: ok, convinced.
-
     * mod_status: Report total CPU time accurately when using a
       threaded MPM.  PR: 23795
         modules/generators/mod_status.c r1.75
diff --git a/server/protocol.c b/server/protocol.c
index 70aafb0af6e..a4523103c5f 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -861,6 +861,7 @@ request_rec *ap_read_request(conn_rec *conn)
 
     apr_pool_create(&p, conn->pool);
     r = apr_pcalloc(p, sizeof(request_rec));
+    apr_pool_tag(p, "request");
     r->pool            = p;
     r->connection      = conn;
     r->server          = conn->base_server;
diff --git a/server/request.c b/server/request.c
index 3476b901040..9e88434debd 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1505,6 +1505,7 @@ static request_rec *make_sub_request(const request_rec *r,
     request_rec *rnew;
 
     apr_pool_create(&rrp, r->pool);
+    apr_pool_tag(rrp, "subrequest");
     rnew = apr_pcalloc(rrp, sizeof(request_rec));
     rnew->pool = rrp;