From: Jeff Trawick <trawick@apache.org>
Date: Tue, 30 Mar 2004 20:49:07 +0000 (+0000)
Subject: core_output_filter: tag the deferred write_pool
X-Git-Tag: 2.0.50~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb63b00b00cf3a2ded51ba14ea750298f72214c;p=thirdparty%2Fapache%2Fhttpd.git

core_output_filter: tag the deferred write_pool

Submitted by:   jorton
Reviewed by:    trawick, stoddard, nd


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

diff --git a/STATUS b/STATUS
index 573cb573fab..c3399f4a6de 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/30 17:38:07 $]
+Last modified at [$Date: 2004/03/30 20:49:07 $]
 
 Release:
 
@@ -295,10 +295,6 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/logresolve.c?r1=1.22&r2=1.23
       +1: trawick, stoddard, nd
 
-    * core_output_filter: tag the deferred write_pool
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.269&r2=1.270
-      +1: trawick, stoddard, nd
-
     * Don't include newlines in strings passed to ap_log_error.
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/main.c?r1=1.155&r2=1.156
       +1: trawick, geoff, nd
diff --git a/server/core.c b/server/core.c
index 72b30053762..7d747098b21 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4076,6 +4076,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
             }
             if (!ctx->deferred_write_pool) {
                 apr_pool_create(&ctx->deferred_write_pool, c->pool);
+                apr_pool_tag(ctx->deferred_write_pool, "deferred_write");
             }
             ap_save_brigade(f, &ctx->b, &b, ctx->deferred_write_pool);