]> git.kaiwu.me - nginx.git/commitdiff
Sub filter: fixed incomplete last buffer on partial match.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 25 Jul 2013 10:54:48 +0000 (14:54 +0400)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 25 Jul 2013 10:54:48 +0000 (14:54 +0400)
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".

src/http/modules/ngx_http_sub_filter_module.c

index 3d32b0fbc92b997283cca87401edfa8b01c8d7d4..fcf6274cb43dde0212c4b47a65848f4bc6737e78 100644 (file)
@@ -369,6 +369,26 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             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))
         {