Mercurial > hg > nginx
changeset 5287:2dbc5e38b65d
Sub filter: fixed incomplete last buffer on partial match.
If a pattern was partially matched at a response end, partially matched
string wasn't send. E.g., a response "fo" was truncated to an empty response
if partially mathed by a pattern "foo".
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 25 Jul 2013 14:54:48 +0400 |
parents | 819c5b53d8b5 |
children | 102d7117ffb8 |
files | src/http/modules/ngx_http_sub_filter_module.c |
diffstat | 1 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_sub_filter_module.c Thu Jul 25 14:54:47 2013 +0400 +++ b/src/http/modules/ngx_http_sub_filter_module.c Thu Jul 25 14:54:48 2013 +0400 @@ -369,6 +369,26 @@ continue; } + if (ctx->buf->last_buf && ctx->looked.len) { + cl = ngx_chain_get_free_buf(r->pool, &ctx->free); + if (cl == NULL) { + return NGX_ERROR; + } + + b = cl->buf; + + ngx_memzero(b, sizeof(ngx_buf_t)); + + b->pos = ctx->looked.data; + b->last = b->pos + ctx->looked.len; + b->memory = 1; + + *ctx->last_out = cl; + ctx->last_out = &cl->next; + + ctx->looked.len = 0; + } + if (ctx->buf->last_buf || ctx->buf->flush || ngx_buf_in_memory(ctx->buf)) {