diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2017-04-18 19:55:23 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2017-04-18 19:55:23 +0300 |
| commit | cb7427d86ccb0483538b7d18a991e1df272167cc (patch) | |
| tree | 641c9aad283d55fb23a09e7af250364300091b7b /src | |
| parent | e8c579a18716395911201d3d5114c03ee018afc9 (diff) | |
| download | nginx-cb7427d86ccb0483538b7d18a991e1df272167cc.tar.gz nginx-cb7427d86ccb0483538b7d18a991e1df272167cc.zip | |
Sub filter: restored ngx_http_set_ctx() at the proper place.
Previously, ngx_http_sub_header_filter() could fail with a partially
initialized context, later accessed in ngx_http_sub_body_filter()
if called from the perl content handler.
The issue had appeared in 2c045e5b8291 (1.9.4).
A better fix would be to handle ngx_http_send_header() errors in
the perl module, though this doesn't seem to be easy enough.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_sub_filter_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c index de58c6f13..6d3de59b0 100644 --- a/src/http/modules/ngx_http_sub_filter_module.c +++ b/src/http/modules/ngx_http_sub_filter_module.c @@ -248,8 +248,6 @@ ngx_http_sub_header_filter(ngx_http_request_t *r) ctx->matches->nelts); } - ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module); - ctx->saved.data = ngx_pnalloc(r->pool, ctx->tables->max_match_len - 1); if (ctx->saved.data == NULL) { return NGX_ERROR; @@ -260,6 +258,8 @@ ngx_http_sub_header_filter(ngx_http_request_t *r) return NGX_ERROR; } + ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module); + ctx->offset = ctx->tables->min_match_len - 1; ctx->last_out = &ctx->out; |