removed clean_context()

kalonelee · Aug 19, 2012 · f190542 · f190542
1 parent 5a267ef
commit f190542
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/ngx_http_subs_filter_module.c b/ngx_http_subs_filter_module.c
@@ -108,8 +108,6 @@ static ngx_int_t  ngx_http_subs_out_chain_append(ngx_http_request_t *r,
     ngx_http_subs_ctx_t *ctx, ngx_buf_t *b);
 static ngx_int_t  ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
     ngx_http_subs_ctx_t *ctx);
-static void ngx_http_subs_body_filter_clean_context(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx);
 static ngx_int_t ngx_http_subs_output(ngx_http_request_t *r,
     ngx_http_subs_ctx_t *ctx, ngx_chain_t *in);
 
@@ -396,18 +394,14 @@ ngx_http_subs_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     }
 
     /* It doesn't output anything, return */
-    if ((ctx->last_out == &ctx->out) && (ctx->busy == NULL)) {
+    if ((ctx->out == NULL) && (ctx->busy == NULL)) {
         return NGX_OK;
     }
 
-    ngx_http_subs_body_filter_clean_context(r, ctx);
-
     return ngx_http_subs_output(r, ctx, in);
 
 failed:
 
-    ngx_http_subs_body_filter_clean_context(r, ctx);
-
     ngx_log_error(NGX_LOG_ERR, log, 0, 
                   "[subs_filter] ngx_http_subs_body_filter error.");
 
@@ -427,6 +421,8 @@ ngx_http_subs_body_filter_init_context(ngx_http_request_t *r, ngx_chain_t *in)
 
     r->connection->buffered |= NGX_HTTP_SUB_BUFFERED;
 
+    ctx->in = NULL;
+
     if (in) {
         if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
             return NGX_ERROR;
@@ -971,16 +967,6 @@ ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
 }
 
 
-static void 
-ngx_http_subs_body_filter_clean_context(ngx_http_request_t *r,
-                                        ngx_http_subs_ctx_t *ctx)
-{
-    ctx->in = NULL;
-    ctx->last_out = NULL;
-    ctx->out_buf = NULL;
-}
-
-
 static ngx_int_t
 ngx_http_subs_output(ngx_http_request_t *r, ngx_http_subs_ctx_t *ctx,
                      ngx_chain_t *in)