ap_pool_join is a debugging function so remove it.

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 9c571ed9fcc73063ac3a314abd12884ec12e8ef7..7c79eac328fd9928ab7e1b990013eb89e93c5500 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2444,7 +2444,6 @@ static int send_parsed_file(request_rec *r)
         * destroyed, that's dealt with in handle_include().
         */
        r->subprocess_env = parent->subprocess_env;
-       ap_pool_join(parent->pool, r->pool);
        r->finfo.mtime = parent->finfo.mtime;
     }
     else {

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 0b00fc39102e526b571392feb73aba1a4c9e0dd4..4c101a8dd9823073afe12acd2c46db39d969ef37 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -181,7 +181,6 @@ static int handle_dir(request_rec *r)
         if (ap_is_HTTP_REDIRECT(rr->status) ||
             (rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
 
-            ap_pool_join(r->pool, rr->pool);
             error_notfound = rr->status;
             r->notes = ap_overlay_tables(r->pool, r->notes, rr->notes);
             r->headers_out = ap_overlay_tables(r->pool, r->headers_out,

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index e3aa38277b82c351e3ce9b886ee5284839a65cb6..8873e490b168837d51f87887680b643c1024ff47 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2643,7 +2643,6 @@ static int handle_multi(request_rec *r)
      * some values in this request will be allocated in r->pool, and others in
      * sub_req->pool.
      */
-    ap_pool_join(r->pool, sub_req->pool);
     r->mtime = 0; /* reset etag info for subrequest */
     r->filename = sub_req->filename;
     r->handler = sub_req->handler;