From: Christophe Jaillet Date: Fri, 30 Apr 2021 12:40:54 +0000 (+0000) Subject: Fix a comment (missing '_' in 'keep_body') X-Git-Tag: 2.5.0-alpha2-ci-test-only~954 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a7434eb75707c2cba104c49eb3881269df910e7;p=thirdparty%2Fapache%2Fhttpd.git Fix a comment (missing '_' in 'keep_body') While at it, fix some space related style issues and a doxygen like comment. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1889327 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c index daa8e5977b9..1768edca1cc 100644 --- a/modules/filters/mod_request.c +++ b/modules/filters/mod_request.c @@ -73,7 +73,6 @@ static apr_status_t keep_body_filter(ap_filter_t *f, apr_bucket_brigade *b, apr_bucket *bucket; apr_off_t len = 0; - if (!ctx) { const char *lenp; request_dir_conf *dconf = ap_get_module_config(f->r->per_dir_config, @@ -119,7 +118,6 @@ static apr_status_t keep_body_filter(ap_filter_t *f, apr_bucket_brigade *b, f->r->kept_body = apr_brigade_create(f->r->pool, f->r->connection->bucket_alloc); ctx->remaining = dconf->keep_body; - } /* get the brigade from upstream, and read it in to get its length */ @@ -262,8 +260,8 @@ static apr_status_t kept_body_filter(ap_filter_t *f, apr_bucket_brigade *b, ctx->remaining -= readbytes; ctx->offset += readbytes; - return APR_SUCCESS; + return APR_SUCCESS; } /** @@ -309,18 +307,18 @@ static void ap_request_insert_filter(request_rec * r) NULL, r, r->connection); } } - } -/** - * Remove the kept_body and keep body filters from this specific request. +/* + * Remove the kept_body and keep_body filters from this specific request. */ -static void ap_request_remove_filter(request_rec * r) +static void ap_request_remove_filter(request_rec *r) { - ap_filter_t * f = r->input_filters; + ap_filter_t *f = r->input_filters; + while (f) { if (f->frec->filter_func.in_func == kept_body_filter || - f->frec->filter_func.in_func == keep_body_filter) { + f->frec->filter_func.in_func == keep_body_filter) { ap_remove_input_filter(f); } f = f->next;