Author: ru
Date: 2012-03-15 20:08:58 +0000 (Thu, 15 Mar 2012)
New Revision: 4543

Log:
Local variable "ngx_http_next_filter" renamed to "ngx_http_next_body_filter"
for consistency with other modules.


Modified:
trunk/src/http/ngx_http_copy_filter_module.c
trunk/src/http/ngx_http_postpone_filter_module.c

Modified: trunk/src/http/ngx_http_copy_filter_module.c
===================================================================
--- trunk/src/http/ngx_http_copy_filter_module.c 2012-03-15 20:04:50 UTC (rev 4542)
+++ trunk/src/http/ngx_http_copy_filter_module.c 2012-03-15 20:08:58 UTC (rev 4543)
@@ -74,7 +74,7 @@
};


-static ngx_http_output_body_filter_pt ngx_http_next_filter;
+static ngx_http_output_body_filter_pt ngx_http_next_body_filter;


static ngx_int_t
@@ -115,7 +115,8 @@
ctx->bufs = conf->bufs;
ctx->tag = (ngx_buf_tag_t) &ngx_http_copy_filter_module;

- ctx->output_filter = (ngx_output_chain_filter_pt) ngx_http_next_filter;
+ ctx->output_filter = (ngx_output_chain_filter_pt)
+ ngx_http_next_body_filter;
ctx->filter_ctx = r;

#if (NGX_HAVE_FILE_AIO)
@@ -292,7 +293,7 @@
static ngx_int_t
ngx_http_copy_filter_init(ngx_conf_t *cf)
{
- ngx_http_next_filter = ngx_http_top_body_filter;
+ ngx_http_next_body_filter = ngx_http_top_body_filter;
ngx_http_top_body_filter = ngx_http_copy_filter;

return NGX_OK;

Modified: trunk/src/http/ngx_http_postpone_filter_module.c
===================================================================
--- trunk/src/http/ngx_http_postpone_filter_module.c 2012-03-15 20:04:50 UTC (rev 4542)
+++ trunk/src/http/ngx_http_postpone_filter_module.c 2012-03-15 20:08:58 UTC (rev 4543)
@@ -46,7 +46,7 @@
};


-static ngx_http_output_body_filter_pt ngx_http_next_filter;
+static ngx_http_output_body_filter_pt ngx_http_next_body_filter;


static ngx_int_t
@@ -80,7 +80,7 @@
if (r->postponed == NULL) {

if (in || c->buffered) {
- return ngx_http_next_filter(r->main, in);
+ return ngx_http_next_body_filter(r->main, in);
}

return NGX_OK;
@@ -116,7 +116,7 @@
"http postpone filter output \"%V?%V\"",
&r->uri, &r->args);

- if (ngx_http_next_filter(r->main, pr->out) == NGX_ERROR) {
+ if (ngx_http_next_body_filter(r->main, pr->out) == NGX_ERROR) {
return NGX_ERROR;
}
}
@@ -171,7 +171,7 @@
static ngx_int_t
ngx_http_postpone_filter_init(ngx_conf_t *cf)
{
- ngx_http_next_filter = ngx_http_top_body_filter;
+ ngx_http_next_body_filter = ngx_http_top_body_filter;
ngx_http_top_body_filter = ngx_http_postpone_filter;

return NGX_OK;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel