Mercurial > hg > nginx
changeset 2942:9ef3719c4d8a stable-0.7
merge r2900:
fix XSLT filter in SSI subrequests
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 15 Jun 2009 09:02:09 +0000 |
parents | 2f731201b00e |
children | 5da043342fe4 |
files | src/core/ngx_output_chain.c src/http/modules/ngx_http_xslt_filter_module.c |
diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_output_chain.c Mon Jun 15 08:58:16 2009 +0000 +++ b/src/core/ngx_output_chain.c Mon Jun 15 09:02:09 2009 +0000 @@ -503,6 +503,7 @@ if (src->pos == src->last) { dst->flush = src->flush; dst->last_buf = src->last_buf; + dst->last_in_chain = src->last_in_chain; } } else { @@ -577,6 +578,7 @@ if (src->file_pos == src->file_last) { dst->flush = src->flush; dst->last_buf = src->last_buf; + dst->last_in_chain = src->last_in_chain; } }
--- a/src/http/modules/ngx_http_xslt_filter_module.c Mon Jun 15 08:58:16 2009 +0000 +++ b/src/http/modules/ngx_http_xslt_filter_module.c Mon Jun 15 09:02:09 2009 +0000 @@ -280,7 +280,7 @@ return ngx_http_xslt_send(r, ctx, NULL); } - if (cl->buf->last_buf) { + if (cl->buf->last_buf || cl->buf->last_in_chain) { ctx->doc = ctx->ctxt->myDoc; @@ -427,8 +427,8 @@ ctx->request = r; } - err = xmlParseChunk(ctx->ctxt, (char *) b->pos, - (int) (b->last - b->pos), b->last_buf); + err = xmlParseChunk(ctx->ctxt, (char *) b->pos, (int) (b->last - b->pos), + (b->last_buf) || (b->last_in_chain)); if (err == 0) { b->pos = b->last; @@ -812,7 +812,6 @@ b->pos = buf; b->last = buf + len; b->memory = 1; - b->last_buf = 1; if (encoding) { r->headers_out.charset.len = ngx_strlen(encoding); @@ -823,6 +822,8 @@ return b; } + b->last_buf = 1; + if (type) { len = ngx_strlen(type);