From: Jim Jagielski <jim@apache.org>
Date: Wed, 23 Nov 2011 15:01:42 +0000 (+0000)
Subject: Use ap_pass_brigade_fchk()
X-Git-Tag: 2.5.0-alpha~7824
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf2fc8ee545cc5d0529391a852d26e0ff7381a76;p=thirdparty%2Fapache%2Fhttpd.git

Use ap_pass_brigade_fchk()

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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 9b655dc9d08..6b4e13e8a64 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -292,19 +292,11 @@ static int cache_quick_handler(request_rec *r, int lookup)
     out = apr_brigade_create(r->pool, r->connection->bucket_alloc);
     e = apr_bucket_eos_create(out->bucket_alloc);
     APR_BRIGADE_INSERT_TAIL(out, e);
-    rv = ap_pass_brigade(r->output_filters, out);
-    if (rv != APR_SUCCESS) {
-        if (rv != AP_FILTER_ERROR) {
-            /* no way to know what type of error occurred */
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
-                          "cache_quick_handler(%s): ap_pass_brigade returned %i",
-                          cache->provider_name, rv);
-            return HTTP_INTERNAL_SERVER_ERROR;
-        }
-        return rv;
-    }
 
-    return OK;
+    return ap_pass_brigade_fchk(r, out,
+                                apr_psprintf(r->pool,
+                                             "cache_quick_handler(%s): ap_pass_brigade returned",
+                                             cache->provider_name));
 }
 
 /**
@@ -576,19 +568,10 @@ static int cache_handler(request_rec *r)
     out = apr_brigade_create(r->pool, r->connection->bucket_alloc);
     e = apr_bucket_eos_create(out->bucket_alloc);
     APR_BRIGADE_INSERT_TAIL(out, e);
-    rv = ap_pass_brigade(r->output_filters, out);
-    if (rv != APR_SUCCESS) {
-        if (rv != AP_FILTER_ERROR) {
-            /* no way to know what type of error occurred */
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
-                          "cache_handler(%s): ap_pass_brigade returned %i",
-                          cache->provider_name, rv);
-            return HTTP_INTERNAL_SERVER_ERROR;
-        }
-        return rv;
-    }
-
-    return OK;
+    return ap_pass_brigade_fchk(r, out,
+                                apr_psprintf(r->pool,
+                                             "cache(%s): ap_pass_brigade returned",
+                                             cache->provider_name));
 }
 
 /*
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index f8668db593e..20fef01c566 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -3051,16 +3051,7 @@ static int handle_map_file(request_rec *r)
         e = apr_bucket_eos_create(c->bucket_alloc);
         APR_BRIGADE_INSERT_TAIL(bb, e);
 
-        rv = ap_pass_brigade(r->output_filters, bb);
-        if (rv != APR_SUCCESS) { 
-            if (rv != AP_FILTER_ERROR) {
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
-                              "ap_pass_brigade returned %d", rv);
-                return HTTP_INTERNAL_SERVER_ERROR;
-            }
-            return AP_FILTER_ERROR;
-        }
-        return OK;
+        return ap_pass_brigade_fchk(r, bb, NULL);
     }
 
     if (r->path_info && *r->path_info) {