httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1240315 - in /httpd/httpd/trunk: include/http_core.h modules/cache/mod_cache.c modules/debugging/mod_firehose.c modules/filters/mod_charset_lite.c modules/filters/mod_ext_filter.c modules/filters/mod_proxy_html.c server/core_filters.c
Date Fri, 03 Feb 2012 19:48:02 GMT
Author: sf
Date: Fri Feb  3 19:48:01 2012
New Revision: 1240315

URL: http://svn.apache.org/viewvc?rev=1240315&view=rev
Log:
Fix various filter functions to return apr_status_t instead of int

Modified:
    httpd/httpd/trunk/include/http_core.h
    httpd/httpd/trunk/modules/cache/mod_cache.c
    httpd/httpd/trunk/modules/debugging/mod_firehose.c
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c
    httpd/httpd/trunk/modules/filters/mod_ext_filter.c
    httpd/httpd/trunk/modules/filters/mod_proxy_html.c
    httpd/httpd/trunk/server/core_filters.c

Modified: httpd/httpd/trunk/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_core.h?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_core.h (original)
+++ httpd/httpd/trunk/include/http_core.h Fri Feb  3 19:48:01 2012
@@ -680,9 +680,9 @@ AP_CORE_DECLARE(const char *) ap_add_if_
 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);
 
 

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Fri Feb  3 19:48:01 2012
@@ -577,7 +577,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;
@@ -726,7 +726,7 @@ static int cache_save_store(ap_filter_t 
  * 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;
@@ -1477,7 +1477,8 @@ static int cache_save_filter(ap_filter_t
  * 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;
@@ -1522,7 +1523,7 @@ static int cache_remove_url_filter(ap_fi
  * 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

Modified: httpd/httpd/trunk/modules/debugging/mod_firehose.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/mod_firehose.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/mod_firehose.c (original)
+++ httpd/httpd/trunk/modules/debugging/mod_firehose.c Fri Feb  3 19:48:01 2012
@@ -260,8 +260,11 @@ static apr_status_t pumpit(ap_filter_t *
     return rv;
 }
 
-static int firehose_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 firehose_input_filter(ap_filter_t *f,
+                                          apr_bucket_brigade *bb,
+                                          ap_input_mode_t mode,
+                                          apr_read_type_e block,
+                                          apr_off_t readbytes)
 {
     apr_bucket *b;
     apr_status_t rv;
@@ -297,7 +300,8 @@ static int firehose_input_filter(ap_filt
     return APR_SUCCESS;
 }
 
-static int firehose_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
+static apr_status_t firehose_output_filter(ap_filter_t *f,
+                                           apr_bucket_brigade *bb)
 {
     apr_bucket *b;
     apr_status_t rv = APR_SUCCESS;

Modified: httpd/httpd/trunk/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_charset_lite.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_charset_lite.c Fri Feb  3 19:48:01 2012
@@ -969,9 +969,9 @@ static apr_status_t xlate_out_filter(ap_
     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,

Modified: httpd/httpd/trunk/modules/filters/mod_ext_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ext_filter.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ext_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ext_filter.c Fri Feb  3 19:48:01 2012
@@ -884,9 +884,9 @@ static apr_status_t ef_output_filter(ap_
     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;

Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Fri Feb  3 19:48:01 2012
@@ -844,7 +844,7 @@ static saxctxt *check_filter_init (ap_fi
     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;

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=1240315&r1=1240314&r2=1240315&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Fri Feb  3 19:48:01 2012
@@ -104,9 +104,9 @@ AP_DECLARE(apr_bucket_brigade *) ap_core
     return ctx->b;
 }
 
-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;



Mime
View raw message