Merge r1240315:

Fix various filter functions to return apr_status_t instead of int


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

6 files changed, 18 insertions, 17 deletions

diff --git a/include/http_core.h b/include/http_core.h
index c4f4bacfa7..fc1b939aa5 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -680,9 +680,9 @@ AP_CORE_DECLARE(const char *) ap_add_if_conf(apr_pool_t *p, core_dir_config *con
 AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);
 
 /* Core filters; not exported. */
-int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
-                         ap_input_mode_t mode, apr_read_type_e block,
-                         apr_off_t readbytes);
+apr_status_t ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
+                                  ap_input_mode_t mode, apr_read_type_e block,
+                                  apr_off_t readbytes);
 apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b);
 
 
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 17fc9d3fda..720d81a558 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -546,7 +546,7 @@ static int cache_handler(request_rec *r)
  *
  * Deliver cached content (headers and body) up the stack.
  */
-static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *in)
+static apr_status_t cache_out_filter(ap_filter_t *f, apr_bucket_brigade *in)
 {
     request_rec *r = f->r;
     apr_bucket *e;
@@ -695,7 +695,7 @@ static int cache_save_store(ap_filter_t *f, apr_bucket_brigade *in,
  * waiting for a potentially slow client to acknowledge the failure.
  */
 
-static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
+static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
 {
     int rv = !OK;
     request_rec *r = f->r;
@@ -1446,7 +1446,8 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
  * Therefore, if this filter is left in, it must mean we need to toss any
  * existing files.
  */
-static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in)
+static apr_status_t cache_remove_url_filter(ap_filter_t *f,
+                                            apr_bucket_brigade *in)
 {
     request_rec *r = f->r;
     cache_request_rec *cache;
@@ -1491,7 +1492,7 @@ static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in)
  * INCLUDES filter, or to a filter that might perform transformations unique
  * to the specific request and that would otherwise be non-cacheable.
  */
-static int cache_filter(ap_filter_t *f, apr_bucket_brigade *in)
+static apr_status_t cache_filter(ap_filter_t *f, apr_bucket_brigade *in)
 {
 
     cache_server_conf
diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
index 526f73c26b..39ab18fc1f 100644
--- a/modules/filters/mod_charset_lite.c
+++ b/modules/filters/mod_charset_lite.c
@@ -969,9 +969,9 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     return rv;
 }
 
-static int xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb,
-                           ap_input_mode_t mode, apr_read_type_e block,
-                           apr_off_t readbytes)
+static apr_status_t xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb,
+                                    ap_input_mode_t mode, apr_read_type_e block,
+                                    apr_off_t readbytes)
 {
     apr_status_t rv;
     charset_req_t *reqinfo = ap_get_module_config(f->r->request_config,
diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c
index 3412c21d38..76ddbc8a03 100644
--- a/modules/filters/mod_ext_filter.c
+++ b/modules/filters/mod_ext_filter.c
@@ -884,9 +884,9 @@ static apr_status_t ef_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     return rv;
 }
 
-static int ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
-                           ap_input_mode_t mode, apr_read_type_e block,
-                           apr_off_t readbytes)
+static apr_status_t ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
+                                    ap_input_mode_t mode, apr_read_type_e block,
+                                    apr_off_t readbytes)
 {
     ef_ctx_t *ctx = f->ctx;
     apr_status_t rv;
diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
index 54e3259938..3bac8982ab 100644
--- a/modules/filters/mod_proxy_html.c
+++ b/modules/filters/mod_proxy_html.c
@@ -844,7 +844,7 @@ static saxctxt *check_filter_init (ap_filter_t *f)
     return f->ctx;
 }
 
-static int proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb)
+static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
     apr_bucket* b;
     meta *m = NULL;
diff --git a/server/core_filters.c b/server/core_filters.c
index 42da5c279f..d094e662fc 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -78,9 +78,9 @@ do { \
 #undef APLOG_MODULE_INDEX
 #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
 
-int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
-                         ap_input_mode_t mode, apr_read_type_e block,
-                         apr_off_t readbytes)
+apr_status_t ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
+                                  ap_input_mode_t mode, apr_read_type_e block,
+                                  apr_off_t readbytes)
 {
     apr_bucket *e;
     apr_status_t rv;